[Pkg-telepathy-commits] [telepathy-glib-1] 44/212: TpProxy: strip detailed error name from error->message if domain is known

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib-1.

commit 2b6a60b67b48ffa679ea8024223c5209450b8ae1
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Mar 21 19:01:54 2014 +0000

    TpProxy: strip detailed error name from error->message if domain is known
    
    Some of the Mission Control tests assert that particular error messages
    are passed-through nicely, which caught this.
---
 telepathy-glib/proxy-methods.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/telepathy-glib/proxy-methods.c b/telepathy-glib/proxy-methods.c
index 4c1d731..9dcf327 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git