[gnome-settings-daemon/gnome-3-8] keyboard: Fix build without IBus
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/gnome-3-8] keyboard: Fix build without IBus
- Date: Thu, 30 May 2013 11:57:27 +0000 (UTC)
commit 22654fdd668efee160762a9a45f28f7af5341b32
Author: Rui Matos <tiagomatos gmail com>
Date: Thu May 30 11:40:37 2013 +0200
keyboard: Fix build without IBus
https://bugzilla.gnome.org/show_bug.cgi?id=701249
plugins/keyboard/gsd-keyboard-manager.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index ebfa7d8..3c48ddd 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]