From 87fb83553f69096efd8cae43f93025a6911563a5 Mon Sep 17 00:00:00 2001 From: Riccardo Setti Date: Tue, 14 Nov 2006 20:50:36 +0000 Subject: 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 --- debian/patches/12_dbus0.9.patch | 20 -------------------- debian/patches/12_dbus1.0.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 20 deletions(-) delete mode 100644 debian/patches/12_dbus0.9.patch create mode 100644 debian/patches/12_dbus1.0.patch diff --git a/debian/patches/12_dbus0.9.patch b/debian/patches/12_dbus0.9.patch deleted file mode 100644 index a3aa9e03..00000000 --- a/debian/patches/12_dbus0.9.patch +++ /dev/null @@ -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); diff --git a/debian/patches/12_dbus1.0.patch b/debian/patches/12_dbus1.0.patch new file mode 100644 index 00000000..85e0b5bc --- /dev/null +++ b/debian/patches/12_dbus1.0.patch @@ -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; -- cgit 1.3.0-6-gf8a5