[gnome-online-accounts] Make sure there is an error set when returning FALSE
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] Make sure there is an error set when returning FALSE
- Date: Fri, 7 Oct 2011 19:06:52 +0000 (UTC)
commit 7cae0b0d088d0fa1789fac1736d9f7233bf4292c
Author: Xavier Claessens <xclaesse gmail com>
Date: Thu Oct 6 17:54:12 2011 +0200
Make sure there is an error set when returning FALSE
https://bugzilla.gnome.org/show_bug.cgi?id=660993
src/goabackend/goaoauth2provider.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
index e0ad84b..42c2d8f 100644
--- a/src/goabackend/goaoauth2provider.c
+++ b/src/goabackend/goaoauth2provider.c
@@ -466,13 +466,11 @@ get_tokens_sync (GoaOAuth2Provider *provider,
}
else
{
- GError *local_error;
JsonParser *parser;
JsonObject *object;
- local_error = NULL;
parser = json_parser_new ();
- if (!json_parser_load_from_data (parser, payload, payload_length, &local_error))
+ if (!json_parser_load_from_data (parser, payload, payload_length, error))
{
g_prefix_error (error, _("Error parsing response as JSON: "));
g_object_unref (parser);
@@ -745,7 +743,7 @@ get_tokens_and_identity (GoaOAuth2Provider *provider,
&data.refresh_token,
&data.access_token_expires_in,
NULL, /* GCancellable */
- error);
+ &data.error);
if (data.access_token == NULL)
{
g_prefix_error (&data.error, _("Error getting an Access Token: "));
@@ -757,7 +755,7 @@ get_tokens_and_identity (GoaOAuth2Provider *provider,
data.access_token,
&data.presentation_identity,
NULL, /* TODO: GCancellable */
- error);
+ &data.error);
if (data.identity == NULL)
{
g_prefix_error (&data.error, _("Error getting identity: "));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]