forked from pool/gnome-settings-daemon
b9dbba74a3
Update to 3.9.2 OBS-URL: https://build.opensuse.org/request/show/176997 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=163
27 lines
1.0 KiB
Diff
27 lines
1.0 KiB
Diff
From 6fa0b3df3054ba8f29885d1584cc5f6605375880 Mon Sep 17 00:00:00 2001
|
|
From: Rui Matos <tiagomatos@gmail.com>
|
|
Date: Thu, 30 May 2013 11:40:37 +0200
|
|
Subject: [PATCH] keyboard: Fix build without IBus
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=701249
|
|
---
|
|
plugins/keyboard/gsd-keyboard-manager.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
|
|
index b15d355..b4131ef 100644
|
|
--- a/plugins/keyboard/gsd-keyboard-manager.c
|
|
+++ b/plugins/keyboard/gsd-keyboard-manager.c
|
|
@@ -1489,7 +1489,9 @@ handle_dbus_method_call (GDBusConnection *connection,
|
|
/* This can only happen if there's an
|
|
* ibus_bus_set_global_engine_async() call
|
|
* going on. */
|
|
+#ifdef HAVE_IBUS
|
|
g_cancellable_cancel (priv->ibus_cancellable);
|
|
+#endif
|
|
g_clear_pointer (&priv->invocation, set_input_source_return);
|
|
priv->pending_ops = 0;
|
|
}
|
|
--
|
|
1.8.1.4
|