[evolution-data-server] Strip remote GDBus errors after talking to GOA
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Strip remote GDBus errors after talking to GOA
- Date: Fri, 18 Jul 2014 12:54:06 +0000 (UTC)
commit 121be67a98dea068811c1c378a968f8480997423
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 ef1ecbb..ba66a5e 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 1e90d92..03daba0 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': "),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]