summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-06-16 18:12:27 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-06-16 18:12:41 +0100
commite294ba3e579db1c12158ce95ad6ff34391cf571a (patch)
tree63d04f151c754776d3d82cd497c0704bc586ee20
parentcce0887278ae105f010d35636fc5f6d654c2d41f (diff)
Show warning if marshalling in dbus_g_method_return fails
Based on a patch from Christian Dywan <christian.dywan@lanedo.com>. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29884 Bug-NB: NB#180486 Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
-rw-r--r--dbus/dbus-gobject.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
index 7ee0b4f..41ac47e 100644
--- a/dbus/dbus-gobject.c
+++ b/dbus/dbus-gobject.c
@@ -3000,7 +3000,13 @@ dbus_g_method_return (DBusGMethodInvocation *context, ...)
g_warning("%s", error);
g_free (error);
}
- _dbus_gvalue_marshal (&iter, &value);
+ else
+ {
+ if (!_dbus_gvalue_marshal (&iter, &value))
+ g_warning ("failed to marshal parameter %d for method %s",
+ i, dbus_message_get_member (
+ dbus_g_message_get_message (context->message)));
+ }
}
va_end (args);