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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-08-05 17:17:40 +0300 (Tue, 05 Aug 2008)
New Revision: 15832

Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch
Log:
fix to the last patch


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2008-08-05 09:30:40 UTC (rev 15831)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2008-08-05 14:17:40 UTC (rev 15832)
@@ -1,3 +1,9 @@
+dbus-glib (0.74-0osso7) experimental; urgency=low
+
+  * Fix the previous patch to always initialise 'ret'. Fixes: NB#87083
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue,  5 Aug 2008 12:47:26 +0300
+
 dbus-glib (0.74-0osso6) experimental; urgency=low
 
   * dbus_g_proxy_call_with_timeout: add check for zero call_id, avoids

Modified: projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch	2008-08-05 09:30:40 UTC (rev 15831)
+++ projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch	2008-08-05 14:17:40 UTC (rev 15832)
@@ -1,6 +1,15 @@
 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	2008-06-16 09:35:42.000000000 +0300
++++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2008-08-05 13:06:09.000000000 +0300
+@@ -2559,7 +2559,7 @@ dbus_g_proxy_call_with_timeout (DBusGPro
+                    GType              first_arg_type,
+                    ...)
+ {
+-  gboolean ret;
++  gboolean ret = TRUE;
+   guint call_id;
+   va_list args;
+   GValueArray *in_args;
 @@ -2575,8 +2575,10 @@ dbus_g_proxy_call_with_timeout (DBusGPro
  
    g_value_array_free (in_args);