[maemo-commits] [maemo-commits] r14101 - projects/haf/trunk/dbus-glib/debian/patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-26 13:03:22 +0300 (Wed, 26 Sep 2007)
New Revision: 14101

Added:
   projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch
Log:
added the patch for real


Added: projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch	2007-09-26 10:02:52 UTC (rev 14100)
+++ projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch	2007-09-26 10:03:22 UTC (rev 14101)
@@ -0,0 +1,24 @@
+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-09-26 12:58:06.348986480 +0300
+@@ -1423,9 +1423,9 @@ static void
+ cancel_pending_call (gpointer key, gpointer val, gpointer data)
+ {
+   DBusGProxyCall *call = key;
+-  DBusGProxy *proxy = data;
++  DBusPendingCall *pending = val;
+ 
+-  dbus_g_proxy_cancel_call (proxy, call);
++  dbus_pending_call_cancel (pending);
+ }
+ 
+ static void
+@@ -1440,7 +1440,7 @@ dbus_g_proxy_dispose (GObject *object)
+     }
+ 
+   /* Cancel outgoing pending calls */
+-  g_hash_table_foreach (priv->pending_calls, cancel_pending_call, proxy);
++  g_hash_table_foreach_remove (priv->pending_calls, cancel_pending_call, NULL);
+   g_hash_table_destroy (priv->pending_calls);
+   priv->pending_calls = NULL;
+