[maemo-commits] [maemo-commits] r14716 - in projects/haf/trunk/dbus-glib/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-11-02 15:49:54 +0200 (Fri, 02 Nov 2007)
New Revision: 14716

Added:
   projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
Log:
remove match in dbus_g_proxy_manager_unregister


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2007-11-02 13:46:01 UTC (rev 14715)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2007-11-02 13:49:54 UTC (rev 14716)
@@ -4,6 +4,7 @@
     Fixes: NB#66881
   * Fix misplaced dbus_free in demarshal_valuearray. 
   * Added missing va_end to locate_attributes in dbus-gparser.c.
+  * Added removing of match to dbus_g_proxy_manager_unregister.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 19 Oct 2007 10:25:05 +0300
 

Added: projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch	2007-11-02 13:46:01 UTC (rev 14715)
+++ projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch	2007-11-02 13:49:54 UTC (rev 14716)
@@ -0,0 +1,18 @@
+diff -pur dbus-glib-0.74/dbus/dbus-gproxy.c dbus-glib-0.74.new/dbus/dbus-gproxy.c
+--- dbus-glib-0.74/dbus/dbus-gproxy.c	2007-04-20 19:36:09.000000000 +0300
++++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2007-11-02 15:50:06.249556712 +0200
+@@ -1059,6 +1059,14 @@ dbus_g_proxy_manager_unregister (DBusGPr
+     {
+       g_hash_table_destroy (manager->proxy_lists);
+       manager->proxy_lists = NULL;
++
++      /* remove the match added in dbus_g_proxy_manager_register */
++      dbus_bus_remove_match (manager->connection,
++                          "type='signal',sender='" DBUS_SERVICE_DBUS
++			  "',path='" DBUS_PATH_DBUS
++			  "',interface='" DBUS_INTERFACE_DBUS
++			  "',member='NameOwnerChanged'",
++			  NULL);
+     }
+ 
+   g_free (tri);