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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-07-27 11:51:07 +0300 (Mon, 27 Jul 2009)
New Revision: 18982

Added:
   projects/haf/trunk/dbus-glib/debian/patches/70-no-assert-on-broken-namecall.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/patches/series
Log:
70-no-assert-on-broken-namecall.patch

Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2009-07-27 08:49:09 UTC (rev 18981)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2009-07-27 08:51:07 UTC (rev 18982)
@@ -1,3 +1,9 @@
+dbus-glib (0.78-0maemo5) unstable; urgency=low
+
+  * Don't assert on broken namecalls. Fixes: NB#116862
+
+ -- Janne Karhunen <Janne.Karhunen at nokia.com>  Mon, 27 Jul 2009 11:46:25 +0300
+
 dbus-glib (0.78-0maemo4) unstable; urgency=low
 
   * Fix invalid memory reference in DBusGProxyManager. Fixes: NB#113229, 

Added: projects/haf/trunk/dbus-glib/debian/patches/70-no-assert-on-broken-namecall.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/70-no-assert-on-broken-namecall.patch	2009-07-27 08:49:09 UTC (rev 18981)
+++ projects/haf/trunk/dbus-glib/debian/patches/70-no-assert-on-broken-namecall.patch	2009-07-27 08:51:07 UTC (rev 18982)
@@ -0,0 +1,18 @@
+Index: dbus-glib-0.78/dbus/dbus-gproxy.c
+===================================================================
+--- dbus-glib-0.78.orig/dbus/dbus-gproxy.c
++++ dbus-glib-0.78/dbus/dbus-gproxy.c
+@@ -1060,9 +1060,10 @@ dbus_g_proxy_manager_unregister (DBusGPr
+ 	  else
+ 	    {
+ 	      link = g_slist_find (manager->unassociated_proxies, proxy);
+-	      g_assert (link != NULL);
+-
+-	      manager->unassociated_proxies = g_slist_delete_link (manager->unassociated_proxies, link);
++	      if (link != NULL)
++	        manager->unassociated_proxies = g_slist_delete_link (manager->unassociated_proxies, link);
++	      else
++		g_warning ("Proxy not in namecall nor on unassociated list - failed namecall?");
+ 	    }
+ 	}
+       else

Modified: projects/haf/trunk/dbus-glib/debian/patches/series
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/series	2009-07-27 08:49:09 UTC (rev 18981)
+++ projects/haf/trunk/dbus-glib/debian/patches/series	2009-07-27 08:51:07 UTC (rev 18982)
@@ -5,3 +5,4 @@
 99-dbus-error.patch
 60-NameOwnerChanged-arg0-matching.patch
 65-upstream-20884.patch
+70-no-assert-on-broken-namecall.patch