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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-03-10 15:58:47 +0200 (Mon, 10 Mar 2008)
New Revision: 15275

Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch
Log:
fix to 08-fix-pending-call-remove.patch


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2008-03-10 09:06:21 UTC (rev 15274)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2008-03-10 13:58:47 UTC (rev 15275)
@@ -1,3 +1,9 @@
+dbus-glib (0.74-0osso5~unreleased) experimental; urgency=low
+
+  * Fix a bug in 08-fix-pending-call-remove.patch. Fixes: NB#79818
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 10 Mar 2008 15:48:30 +0200
+
 dbus-glib (0.74-0osso4) experimental; urgency=low
 
   * Fixed build dependency libexpat-dev -> libexpat1-dev. Fixes: NB#80419

Modified: 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	2008-03-10 09:06:21 UTC (rev 15274)
+++ projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch	2008-03-10 13:58:47 UTC (rev 15275)
@@ -1,8 +1,11 @@
-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 13:11:55.298966928 +0300
-@@ -1422,10 +1422,9 @@ dbus_g_proxy_class_init (DBusGProxyClass
- static void
+--- dbus-glib-0.74/dbus/dbus-gproxy.c.old	2008-03-07 16:39:02.000000000 +0200
++++ dbus-glib-0.74/dbus/dbus-gproxy.c	2008-03-07 16:52:08.000000000 +0200
+@@ -1433,13 +1433,14 @@ dbus_g_proxy_class_init (DBusGProxyClass
+                   G_TYPE_NONE, 2, DBUS_TYPE_MESSAGE, G_TYPE_POINTER);
+ }
+ 
+-static void
++static gboolean
  cancel_pending_call (gpointer key, gpointer val, gpointer data)
  {
 -  DBusGProxyCall *call = key;
@@ -11,10 +14,12 @@
  
 -  dbus_g_proxy_cancel_call (proxy, call);
 +  dbus_pending_call_cancel (pending);
++
++  return TRUE;
  }
  
  static void
-@@ -1440,7 +1439,7 @@ dbus_g_proxy_dispose (GObject *object)
+@@ -1454,7 +1455,7 @@ dbus_g_proxy_dispose (GObject *object)
      }
  
    /* Cancel outgoing pending calls */