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
This commit is contained in:
Dan Winship 2011-09-22 15:45:21 -04:00
parent ff0d11c89c
commit 5adb5411fa

View File

@ -120,7 +120,7 @@ shell_dbus_init (gboolean replace)
/* ...and the on-screen keyboard service */ /* ...and the on-screen keyboard service */
if (!dbus_g_proxy_call (bus, "RequestName", &error, if (!dbus_g_proxy_call (bus, "RequestName", &error,
G_TYPE_STRING, "org.gnome.Caribou.Keyboard", 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_INVALID,
G_TYPE_UINT, &request_name_result, G_TYPE_UINT, &request_name_result,
G_TYPE_INVALID)) G_TYPE_INVALID))