Small patch to NetworkManager for D-Bus .91

I don't recall the exact version of D-Bus where it changed, but J5 said that it has been deprecated for about a year - the change is minor, simply changing dbus_connection_disconnect -> dbus_connection_close.

Patch attached, it should work against D-Bus .62 and does work against .91. I don't have commit access or anything, that is why I am sending here.
diff -ruN 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	2006-07-28 19:27:51.000000000 -0500
+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-07-28 19:28:50.000000000 -0500
@@ -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);

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]