From 8f8e512b3714d36e57406c47faf9c5c966fcd137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 10 Mar 2017 16:20:25 +0100 Subject: [PATCH] main: Use GBusNameOwnerFlags to specify flags 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 --- src/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 78a300d28..44fdd832c 100644 --- a/src/main.c +++ b/src/main.c @@ -139,7 +139,7 @@ shell_dbus_init (gboolean replace) request_name_flags = G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT; if (replace) - request_name_flags |= DBUS_NAME_FLAG_REPLACE_EXISTING; + request_name_flags |= G_BUS_NAME_OWNER_FLAGS_REPLACE; shell_dbus_acquire_name (bus, request_name_flags, @@ -169,7 +169,7 @@ shell_dbus_init (gboolean replace) NULL); /* ...and the on-screen keyboard service */ shell_dbus_acquire_name (bus, - DBUS_NAME_FLAG_REPLACE_EXISTING, + G_BUS_NAME_OWNER_FLAGS_REPLACE, &request_name_result, "org.gnome.Caribou.Keyboard", FALSE); g_object_unref (bus);