[maemo-commits] [maemo-commits] r14551 - in projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-19 16:48:32 +0300 (Fri, 19 Oct 2007)
New Revision: 14551

Modified:
   projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/changelog
   projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/patches/09-replace-invalid-assert.patch
Log:
fix dbus_g_proxy_call to handle the zero return value


Modified: projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/changelog
===================================================================
--- projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/changelog	2007-10-19 13:44:57 UTC (rev 14550)
+++ projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/changelog	2007-10-19 13:48:32 UTC (rev 14551)
@@ -1,3 +1,9 @@
+dbus-glib (0.74-0osso2fix3) experimental; urgency=low
+
+  * Fix dbus_g_proxy_call to handle the zero return value. Fixes: NB#66881
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 19 Oct 2007 16:46:42 +0300
+
 dbus-glib (0.74-0osso2fix2) experimental; urgency=low
 
   * Use g_debug instead of g_error in the fix. Fixes: NB#66881

Modified: projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/patches/09-replace-invalid-assert.patch
===================================================================
--- projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/patches/09-replace-invalid-assert.patch	2007-10-19 13:44:57 UTC (rev 14550)
+++ projects/haf/tags/dbus-glib/0.74-0osso2fix3/debian/patches/09-replace-invalid-assert.patch	2007-10-19 13:48:32 UTC (rev 14551)
@@ -1,6 +1,6 @@
 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-10-19 14:29:37.148438896 +0300
++++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2007-10-19 16:43:34.990501168 +0300
 @@ -2167,7 +2167,11 @@ dbus_g_proxy_begin_call_internal (DBusGP
                                          timeout))
      goto oom;
@@ -14,3 +14,24 @@
  
    call_id = ++priv->call_id_counter;
  
+@@ -2526,8 +2530,18 @@ dbus_g_proxy_call (DBusGProxy        *pr
+ 
+   g_value_array_free (in_args);
+ 
+-  first_arg_type = va_arg (args, GType);
+-  ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
++  if (call_id > 0)
++    {
++      first_arg_type = va_arg (args, GType);
++      ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
++    }
++  else
++    {
++      g_set_error (error, DBUS_GERROR,
++		   DBUS_GERROR_FAILED,
++		   _("Disconnection or out-of-memory"));
++      ret = FALSE;
++    }
+ 
+   va_end (args);
+