[Pkg-utopia-commits] r1148 - packages/unstable/networkmanager/debian/patches

[Riccardo Setti]

Author: giskard-guest
Date: 2006-11-14 21:50:36 +0100 (Tue, 14 Nov 2006)
New Revision: 1148

Added:
   packages/unstable/networkmanager/debian/patches/12_dbus1.0.patch
Removed:
   packages/unstable/networkmanager/debian/patches/12_dbus0.9.patch
Log:
added 12_dbus1.0.patch

Deleted: packages/unstable/networkmanager/debian/patches/12_dbus0.9.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/12_dbus0.9.patch	2006-11-14 16:46:02 UTC (rev 1147)
+++ packages/unstable/networkmanager/debian/patches/12_dbus0.9.patch	2006-11-14 20:50:36 UTC (rev 1148)
@@ -1,20 +0,0 @@
---- ./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);

Added: packages/unstable/networkmanager/debian/patches/12_dbus1.0.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/12_dbus1.0.patch	2006-11-14 16:46:02 UTC (rev 1147)
+++ packages/unstable/networkmanager/debian/patches/12_dbus1.0.patch	2006-11-14 20:50:36 UTC (rev 1148)
@@ -0,0 +1,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;