about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/12_dbus1.0.patch40
1 files changed, 20 insertions, 20 deletions
diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch
index 85e0b5bc..d9380526 100644
--- a/debian/patches/12_dbus1.0.patch
+++ b/debian/patches/12_dbus1.0.patch
@@ -1,23 +1,23 @@
---- ./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);

+--- ./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 @@