From ccfab8a933d04b491895df859ade211c1187fc77 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 5 Dec 2005 18:17:55 +0000 Subject: [PATCH] 2005-12-05 Dan Williams * gnome/applet/applet-dbus.c - Work with dbus 0.6 too git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1117 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ gnome/applet/applet-dbus.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 05b3a6c57a..5b86889c53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-05 Dan Williams + + * gnome/applet/applet-dbus.c + - Work with dbus 0.6 too + 2005-12-03 Dan Williams * src/NetworkManagerUtils.[ch] diff --git a/gnome/applet/applet-dbus.c b/gnome/applet/applet-dbus.c index 6448e465a3..be89df89a0 100644 --- a/gnome/applet/applet-dbus.c +++ b/gnome/applet/applet-dbus.c @@ -375,6 +375,7 @@ static DBusConnection * nmwa_dbus_init (NMWirelessApplet *applet) DBusError error; DBusObjectPathVTable vtable = { NULL, &nmi_dbus_info_message_handler, NULL, NULL, NULL, NULL }; int acquisition; + int flags = 0; g_return_val_if_fail (applet != NULL, NULL); @@ -388,7 +389,12 @@ static DBusConnection * nmwa_dbus_init (NMWirelessApplet *applet) } dbus_error_init (&error); - acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, &error); +#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) + flags &= DBUS_NAME_FLAG_REPLACE_EXISTING; +#else + flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT; +#endif + acquisition = dbus_bus_request_name (connection, NMI_DBUS_SERVICE, flags, &error); if (dbus_error_is_set (&error)) { nm_warning ("nmwa_dbus_init() could not acquire its service. dbus_bus_acquire_service() says: '%s'", error.message);