summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-08-14 14:19:31 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-08-14 14:19:31 -0400
commite830b66604759be52a4afaf665fd9f29aceec6aa (patch)
treefc7831ef219a533975b6a935708a8e0d38f62717
parent5f0fab21566ab9c46817f33d1e78f504825402ef (diff)
downloadmutter-e830b66604759be52a4afaf665fd9f29aceec6aa.tar.gz
Remove a few extra HAVE_XKBs
-rw-r--r--src/core/bell.h6
-rw-r--r--src/x11/events.c2
2 files changed, 0 insertions, 8 deletions
diff --git a/src/core/bell.h b/src/core/bell.h
index dbbafa7c5..6b8ed1e28 100644
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -57,12 +57,6 @@ void meta_bell_set_audible (MetaDisplay *display, gboolean audible);
* to send us bell notifications, and then also switching
* off the audible bell if we're using a visual one ourselves.
*
- * Unlike most X extensions we use, we only initialise XKB here
- * (rather than in main()). It's possible that XKB is not
- * installed at all, but if that was known at build time
- * we will have HAVE_XKB undefined, which will cause this
- * function to be a no-op.
- *
* \bug There is a line of code that's never run that tells
* XKB to reset the bell status after we quit. Bill H said
* (<http://bugzilla.gnome.org/show_bug.cgi?id=99886#c12>)
diff --git a/src/x11/events.c b/src/x11/events.c
index 5b8659a4a..4e3e62121 100644
--- a/src/x11/events.c
+++ b/src/x11/events.c
@@ -1584,7 +1584,6 @@ handle_other_xevent (MetaDisplay *display,
}
break;
default:
-#ifdef HAVE_XKB
if (event->type == display->xkb_base_event_type)
{
XkbAnyEvent *xkb_ev = (XkbAnyEvent *) event;
@@ -1606,7 +1605,6 @@ handle_other_xevent (MetaDisplay *display,
break;
}
}
-#endif
break;
}