brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Use GBusNameOwnerFlags to specify flags

Browse Source 
We are still using DBUS_NAME_FLAG_REPLACE_EXISTING from dbus-glib
in some places (whose headers are drawn in via telepathy-glib).
As both GIO and dbus-glib use the values that will end up being
sent on the bus, the define and enum value are interchangeable,
but it's clearly better to consistently use the library that is
explicitly included.

https://bugzilla.gnome.org/show_bug.cgi?id=771721
This commit is contained in:
Florian Müllner 2017-03-10 16:20:25 +01:00
parent 3c828c8387
commit 8f8e512b37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@ -139,7 +139,7 @@ shell_dbus_init (gboolean replace)
request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT; request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT;
if (replace) if (replace)
request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING; request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE;
shell_dbus_acquire_name (bus, shell_dbus_acquire_name (bus,
request_name_flags, request_name_flags,
@ -169,7 +169,7 @@ shell_dbus_init (gboolean replace)
NULL); NULL);
/* ...and the on-screen keyboard service */ /* ...and the on-screen keyboard service */
shell_dbus_acquire_name (bus, shell_dbus_acquire_name (bus,
DBUS_NAME_FLAG_REPLACE_EXISTING, G_BUS_NAME_OWNER_FLAGS_REPLACE,
&request_name_result, &request_name_result,
"org.gnome.Caribou.Keyboard", FALSE); "org.gnome.Caribou.Keyboard", FALSE);
g_object_unref (bus); g_object_unref (bus);