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

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2009-01-30 20:24:08 +0200 (Fri, 30 Jan 2009)
New Revision: 17335

Added:
   projects/haf/trunk/dbus-glib/debian/patches/20-owner_names-assert.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/patches/series
Log:
Do not assert if owner_names is NULL when re-registering a proxy manager

Fixes: NB#90970


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2009-01-30 09:39:31 UTC (rev 17334)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2009-01-30 18:24:08 UTC (rev 17335)
@@ -2,6 +2,8 @@
 
   * Teach dbus_g_method_return_error about DBUS_GERROR. (Fixes: NB#95048)
     Thanks to Simon McVittie <simon.mcvittie at collabora.co.uk>.
+  * Do not assert if owner_names is NULL when re-registering a proxy manager.
+    (Fixes: NB#90970)
 
  -- Guillem Jover <guillem.jover at nokia.com>  Wed, 28 Jan 2009 20:16:43 +0200
 

Added: projects/haf/trunk/dbus-glib/debian/patches/20-owner_names-assert.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/20-owner_names-assert.patch	2009-01-30 09:39:31 UTC (rev 17334)
+++ projects/haf/trunk/dbus-glib/debian/patches/20-owner_names-assert.patch	2009-01-30 18:24:08 UTC (rev 17335)
@@ -0,0 +1,32 @@
+Index: b/dbus/dbus-gproxy.c
+===================================================================
+--- a/dbus/dbus-gproxy.c
++++ b/dbus/dbus-gproxy.c
+@@ -899,19 +899,21 @@ dbus_g_proxy_manager_register (DBusGProx
+ 
+   LOCK_MANAGER (manager);
+ 
+-  if (manager->proxy_lists == NULL)
++  if (manager->owner_names == NULL)
+     {
+-      g_assert (manager->owner_names == NULL);
++      manager->owner_names = g_hash_table_new_full (g_str_hash,
++                                                    g_str_equal,
++                                                    g_free,
++                                                    NULL);
++    }
+ 
++  if (manager->proxy_lists == NULL)
++    {
+       list = NULL;
+       manager->proxy_lists = g_hash_table_new_full (tristring_hash,
+                                                     tristring_equal,
+                                                     NULL,
+                                                     (GFreeFunc) g_proxy_list_free);
+-      manager->owner_names = g_hash_table_new_full (g_str_hash,
+-                                                    g_str_equal,
+-                                                    g_free,
+-                                                    NULL);
+       /* FIXME - for now we listen for all NameOwnerChanged; once
+        * Anders' detail patch lands we should add individual rules
+        * 

Modified: projects/haf/trunk/dbus-glib/debian/patches/series
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/series	2009-01-30 09:39:31 UTC (rev 17334)
+++ projects/haf/trunk/dbus-glib/debian/patches/series	2009-01-30 18:24:08 UTC (rev 17335)
@@ -1,4 +1,5 @@
 01-dbus-gproxy-crash-fix.patch
 07-install-doxygen-docs.patch
 13-zero-call_id-fix.patch
+20-owner_names-assert.patch
 99-dbus-error.patch