[gnome-online-accounts] owncloud: Fix the error propagation in refresh_account



commit c4c3342278fb6a4ec143d44b6f74e8788e0e1f78
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Dec 4 18:27:50 2012 +0100

    owncloud: Fix the error propagation in refresh_account
    
    ... and make it consistent with add_account.
    
    Fixes: https://bugzilla.gnome.org/689642

 src/goabackend/goaowncloudprovider.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/goabackend/goaowncloudprovider.c b/src/goabackend/goaowncloudprovider.c
index bbce559..4fe5a85 100644
--- a/src/goabackend/goaowncloudprovider.c
+++ b/src/goabackend/goaowncloudprovider.c
@@ -908,7 +908,7 @@ refresh_account (GoaProvider    *provider,
   response = gtk_dialog_run (GTK_DIALOG (dialog));
   if (response != GTK_RESPONSE_OK)
     {
-      g_set_error (error,
+      g_set_error (&data.error,
                    GOA_ERROR,
                    GOA_ERROR_DIALOG_DISMISSED,
                    _("Dialog was dismissed"));
@@ -964,7 +964,7 @@ refresh_account (GoaProvider    *provider,
                                                     object,
                                                     g_variant_builder_end (&builder),
                                                     NULL, /* GCancellable */
-                                                    error))
+                                                    &data.error))
     goto out;
 
   goa_account_call_ensure_credentials (account,
@@ -974,6 +974,9 @@ refresh_account (GoaProvider    *provider,
   ret = TRUE;
 
  out:
+  if (data.error != NULL)
+    g_propagate_error (error, data.error);
+
   gtk_widget_destroy (dialog);
   g_free (uri);
   g_free (uri_webdav);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]