summary refs log tree commit diff
diff options
context:
space:
mode:
authorRiccardo Setti <giskard@autistici.org>2006-09-05 17:50:22 +0000
committerRiccardo Setti <giskard@autistici.org>2006-09-05 17:50:22 +0000
commit23a97e78c68fb99151de2bc640dfebf358794d43 (patch)
tree151717eaa5e4bf0e69706371aa08a707cdd0923f
parent6ee72e595c622a051bf906ca46a20a8117a2fb33 (diff)
* Changed adeprecated dbus function (closes: 385380)
 - added 12_dbus0.9.patch.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@994 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/12_dbus0.9.patch20
2 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b8a7cd0f..e23aacaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+network-manager (0.6.4-3) unstable; urgency=low
+
+  * Changed adeprecated dbus function (closes: 385380)
+   - added 12_dbus0.9.patch.
+
+ -- Riccardo Setti <giskard@debian.org>  Tue,  5 Sep 2006 19:48:00 +0200
+
 network-manager (0.6.4-2) unstable; urgency=low
 
   * Ship the nm-tool binary. (closes: #384891)
diff --git a/debian/patches/12_dbus0.9.patch b/debian/patches/12_dbus0.9.patch
new file mode 100644
index 00000000..a3aa9e03
--- /dev/null
+++ b/debian/patches/12_dbus0.9.patch
@@ -0,0 +1,20 @@
+--- ./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);