lxnay
00cd967bda
git-svn-id: http://svn.sabayonlinux.org/overlay@410 d7aec97c-591d-0410-af39-a8856400b30a
17 lines
656 B
Diff
17 lines
656 B
Diff
--- src/NetworkManagerDbus.c 2006-11-12 22:00:43.000000000 +0100
|
|
+++ src/NetworkManagerDbus.c 2006-11-12 21:59:36.000000000 +0100
|
|
@@ -833,10 +833,10 @@
|
|
}
|
|
|
|
dbus_error_init (&error);
|
|
-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
|
|
- flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */
|
|
-#else
|
|
+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
|
|
flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
|
|
+#else
|
|
+ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */
|
|
#endif
|
|
ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);
|
|
if (dbus_error_is_set (&error))
|