blob: d9380526e07d6ce3671be9176a7bfc7524352768 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- ./gnome/libnm_glib/libnm_glib.c.old 2006-08-24 18:08:22.200388750 +0200
+++ ./gnome/libnm_glib/libnm_glib.c 2006-08-24 18:08:33.353085750 +0200
@@ -230,7 +230,7 @@
{
/* Try to reactivate our connection to dbus on the next pass through the event loop */
ctx->nm_state = LIBNM_NO_DBUS;
- dbus_connection_disconnect (ctx->dbus_con);
+ dbus_connection_close (ctx->dbus_con);
libnm_glib_schedule_dbus_watcher (ctx);
}
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
@@ -444,7 +444,7 @@
g_main_loop_unref (ctx->g_main_loop);
if (ctx->dbus_con)
- dbus_connection_disconnect (ctx->dbus_con);
+ dbus_connection_close (ctx->dbus_con);
if (ctx->callbacks_lock)
g_mutex_free (ctx->callbacks_lock);
--- src/NetworkManagerDbus.c.orig 2006-11-14 21:10:57.000000000 +0100
+++ src//NetworkManagerDbus.c 2006-11-14 21:13:19.000000000 +0100
@@ -832,7 +832,7 @@
}
dbus_error_init (&error);
-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
+#if (DBUS_VERSION_MAJOR == 1) || (DBUS_VERSION_MINOR >= 60)
flags = DBUS_NAME_FLAG_DO_NOT_QUEUE; /* Prohibit replacement is now the default */
#else
flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
|
