blob: a8ce1422cf0facbbfc9665b0701ee9bfa01cad5c (
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
32
33
34
35
36
37
38
39
40
41
42
|
diff -urN NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c
--- NetworkManager-0.6.4.orig/gnome/libnm_glib/libnm_glib.c 2007-01-10 21:58:05.000000000 +0100
+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c 2007-01-10 22:00:00.000000000 +0100
@@ -230,7 +230,8 @@
{
/* 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_unref (ctx->dbus_con);
+ ctx->dbus_con = NULL;
libnm_glib_schedule_dbus_watcher (ctx);
}
else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
@@ -444,7 +445,10 @@
g_main_loop_unref (ctx->g_main_loop);
if (ctx->dbus_con)
- dbus_connection_disconnect (ctx->dbus_con);
+ {
+ dbus_connection_unref (ctx->dbus_con);
+ ctx->dbus_con = NULL;
+ }
if (ctx->callbacks_lock)
g_mutex_free (ctx->callbacks_lock);
diff -urN NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c NetworkManager-0.6.4/src/NetworkManagerDbus.c
--- NetworkManager-0.6.4.orig/src/NetworkManagerDbus.c 2007-01-10 21:58:05.000000000 +0100
+++ NetworkManager-0.6.4/src/NetworkManagerDbus.c 2007-01-10 22:01:49.000000000 +0100
@@ -831,10 +831,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 */
+#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
+ flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
#else
- flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
+ flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;
#endif
ret = dbus_bus_request_name (connection, NM_DBUS_SERVICE, flags, &error);
if (dbus_error_is_set (&error))
|
