[Pkg-utopia-commits] r1339 - in packages/unstable/dbus-glib/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2007-04-09 20:18:39 +0000 (Mon, 09 Apr 2007)
New Revision: 1339

Removed:
   packages/unstable/dbus-glib/debian/patches/00_unref_crash.patch
Modified:
   packages/unstable/dbus-glib/debian/changelog
Log:
* debian/patches/00_unref_crash.patch:
  removed. Fixed upstream.

Modified: packages/unstable/dbus-glib/debian/changelog
===================================================================
--- packages/unstable/dbus-glib/debian/changelog	2007-04-09 20:11:23 UTC (rev 1338)
+++ packages/unstable/dbus-glib/debian/changelog	2007-04-09 20:18:39 UTC (rev 1339)
@@ -2,8 +2,10 @@
 
   * Upload to unstable
   * Merge experimental branch
+  * debian/patches/00_unref_crash.patch:
+    removed. Fixed upstream.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 09 Apr 2007 22:05:16 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 09 Apr 2007 22:16:26 +0200
 
 dbus-glib (0.73-1) experimental; urgency=low
 

Deleted: packages/unstable/dbus-glib/debian/patches/00_unref_crash.patch
===================================================================
--- packages/unstable/dbus-glib/debian/patches/00_unref_crash.patch	2007-04-09 20:11:23 UTC (rev 1338)
+++ packages/unstable/dbus-glib/debian/patches/00_unref_crash.patch	2007-04-09 20:18:39 UTC (rev 1339)
@@ -1,40 +0,0 @@
-commit 9bfec032a72e7af5945336fecbb9b6e0b6f2de9e
-Author: Rob Taylor <rob.taylor at collabora.co.uk>
-Date:   Wed Oct 25 18:24:53 2006 +0100
-
-    Fixes crash if disposing one DBusGProxy causes another for the same service
-    to be unrefed in a destoyed callback.
-
-diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
-index bd8ab20..84b2196 100644
---- a/dbus/dbus-gproxy.c
-+++ b/dbus/dbus-gproxy.c
-@@ -664,6 +664,10 @@ unassociate_proxies (gpointer key, gpoin
- 	  else
- 	    {
- 	      data->destroyed = g_slist_prepend (data->destroyed, proxy);
-+              /* make contents of list into weak pointers in case the objects
-+               * unref each other when disposing */
-+              g_object_add_weak_pointer (G_OBJECT (proxy),
-+                  &(data->destroyed->data));
- 	    }
- 	}
-     }
-@@ -740,8 +744,16 @@ dbus_g_proxy_manager_replace_name_owner
- 
- 	  UNLOCK_MANAGER (manager);
- 
-+          /* the destroyed list's data pointers are weak pointers, so that we
-+           * don't end up calling destroy on proxies which have already been
-+           * freed up as a result of other ones being destroyed */
- 	  for (tmp = data.destroyed; tmp; tmp = tmp->next)
--	    dbus_g_proxy_destroy (tmp->data);
-+            if (tmp->data != NULL)
-+              {
-+                g_object_remove_weak_pointer (G_OBJECT (tmp->data),
-+                    &(tmp->data));
-+                dbus_g_proxy_destroy (tmp->data);
-+              }
- 	  g_slist_free (data.destroyed);
- 
- 	  LOCK_MANAGER (manager);