about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRiccardo Setti <giskard@autistici.org>2006-11-14 20:50:36 +0000
committerRiccardo Setti <giskard@autistici.org>2006-11-14 20:50:36 +0000
commit87fb83553f69096efd8cae43f93025a6911563a5 (patch)
treedfaa81cdbe91bb00cae408e3e617363fc9cf9310
parent13efdc9ecc8bd7c9d5576cc1d5c07d13c6c02ab1 (diff)
added 12_dbus1.0.patch
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@1148 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/patches/12_dbus1.0.patch (renamed from debian/patches/12_dbus0.9.patch)11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/patches/12_dbus0.9.patch b/debian/patches/12_dbus1.0.patch
index a3aa9e03..85e0b5bc 100644
--- a/debian/patches/12_dbus0.9.patch
+++ b/debian/patches/12_dbus1.0.patch
@@ -18,3 +18,14 @@
  

  	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;