From 5adb5411fa3d587b44026afee788cc40726ab6f7 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 22 Sep 2011 15:45:21 -0400 Subject: [PATCH] keyboard: fix D-Bus name acquisition flags to totally block Antler We never want the antler keyboard to run if gnome-shell is running, so grab org.gnome.Caribou.Keyboard without the "allow replacement" flag. https://bugzilla.gnome.org/show_bug.cgi?id=659865 --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 0c505e78b..503f8a1fc 100644 --- a/src/main.c +++ b/src/main.c @@ -120,7 +120,7 @@ shell_dbus_init (gboolean replace) /* ...and the on-screen keyboard service */ if (!dbus_g_proxy_call (bus, "RequestName", &error, G_TYPE_STRING, "org.gnome.Caribou.Keyboard", - G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags, + G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING, G_TYPE_INVALID, G_TYPE_UINT, &request_name_result, G_TYPE_INVALID))