summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-21 19:01:54 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-03-21 19:01:54 +0000
commit03a5f5d4e41e9b0f1120abc94800ed52e7ed2cb5 (patch)
tree51f57c89a10abaceb4db9be6af1bed26df63ec0d
parent2029cb1984f122c47f97b56393a559d5db6e5cf7 (diff)
TpProxy: strip detailed error name from error->message if domain is knowngdbus2
Some of the Mission Control tests assert that particular error messages are passed-through nicely, which caught this.
-rw-r--r--telepathy-glib/proxy-methods.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/telepathy-glib/proxy-methods.c b/telepathy-glib/proxy-methods.c
index 4c1d731c8..9dcf327a8 100644
--- a/telepathy-glib/proxy-methods.c
+++ b/telepathy-glib/proxy-methods.c
@@ -200,6 +200,10 @@ tp_proxy_pending_call_async_ready_cb (GObject *source_object,
}
else
{
+ if (error->domain != G_IO_ERROR ||
+ error->code != G_IO_ERROR_DBUS_ERROR)
+ g_dbus_error_strip_remote_error (error);
+
DEBUG ("%p: %s #%d: %s", pc,
g_quark_to_string (error->domain), error->code,
error->message);