summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Matos <tiagomatos@gmail.com>2013-05-30 11:40:37 +0200
committerRui Matos <tiagomatos@gmail.com>2013-05-30 13:56:37 +0200
commit22654fdd668efee160762a9a45f28f7af5341b32 (patch)
treea284dd4de36c3160621f0e4590f204efa82d23aa
parent9e7de0387e8cdce7e1752d11eda9c6e06e45f753 (diff)
downloadgnome-settings-daemon-22654fdd668efee160762a9a45f28f7af5341b32.tar.gz
keyboard: Fix build without IBus
https://bugzilla.gnome.org/show_bug.cgi?id=701249
-rw-r--r--plugins/keyboard/gsd-keyboard-manager.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index ebfa7d87..3c48ddd4 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -1542,10 +1542,12 @@ handle_dbus_method_call (GDBusConnection *connection,
if (g_str_equal (method_name, "SetInputSource")) {
if (priv->invocation) {
+#ifdef HAVE_IBUS
/* This can only happen if there's an
* ibus_bus_set_global_engine_async() call
* going on. */
g_cancellable_cancel (priv->ibus_cancellable);
+#endif
g_clear_pointer (&priv->invocation, set_input_source_return);
priv->pending_ops = 0;
}