fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-11 18:00:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-12-05 Dan Williams <dcbw@redhat.com>

Browse source 
* 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
This commit is contained in:
Dan Williams 2005-12-05 18:17:55 +00:00
parent 1d8201cb9e
commit ccfab8a933
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-12-05 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-dbus.c
- Work with dbus 0.6 too
2005-12-03 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerUtils.[ch]

8
gnome/applet/applet-dbus.c
View file

@ -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);