[maemo-commits] [maemo-commits] r14553 - projects/haf/trunk/dbus-glib/debian/patches
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Oct 19 17:18:11 EEST 2007
- Previous message: [maemo-commits] r14552 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r14554 - projects/haf/trunk/dbus-glib/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: kihamala Date: 2007-10-19 17:18:01 +0300 (Fri, 19 Oct 2007) New Revision: 14553 Modified: projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch Log: bugfix to the patch Modified: projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch =================================================================== --- projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch 2007-10-19 14:09:39 UTC (rev 14552) +++ projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch 2007-10-19 14:18:01 UTC (rev 14553) @@ -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); +
- Previous message: [maemo-commits] r14552 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r14554 - projects/haf/trunk/dbus-glib/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]