[evolution-data-server/evolution-data-server-3-12] Strip remote GDBus errors after talking to GOA

[Milan Crha <mcrha src gnome org>]

commit 95660457802e719236a4085181fbf10495cfbece
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jul 18 14:51:56 2014 +0200

    Strip remote GDBus errors after talking to GOA
    
    The GDBus error codes were shown in UI, which is not good, thus
    when the call to a GOA fails, the remote GDBus error should be
    removed from the error message.

 modules/gnome-online-accounts/goaewsclient.c       |    1 +
 .../module-gnome-online-accounts.c                 |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/modules/gnome-online-accounts/goaewsclient.c b/modules/gnome-online-accounts/goaewsclient.c
index 98eede2..0a97fa4 100644
--- a/modules/gnome-online-accounts/goaewsclient.c
+++ b/modules/gnome-online-accounts/goaewsclient.c
@@ -515,6 +515,7 @@ goa_ews_autodiscover (GoaObject *goa_object,
                        data->session, data->msgs[1],
                        ews_autodiscover_response_cb, simple);
        } else {
+               g_dbus_error_strip_remote_error (error);
                g_simple_async_result_take_error (simple, error);
                g_simple_async_result_complete_in_idle (simple);
                g_object_unref (simple);
diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c 
b/modules/gnome-online-accounts/module-gnome-online-accounts.c
index 4686e77..99a6b1e 100644
--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
@@ -1282,6 +1282,9 @@ gnome_online_accounts_get_access_token_sync (EOAuth2Support *support,
        g_object_unref (goa_account);
        g_object_unref (goa_object);
 
+       if (error && *error)
+               g_dbus_error_strip_remote_error (*error);
+
        g_prefix_error (
                error,
                _("Failed to obtain an access token for '%s': "),