[frogr] Don't fetch sets/groups/tags nor upload anything if not connected



commit cf477347bd610f5f4d7bd83b2d35a58fb803af09
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Thu Dec 13 16:01:13 2012 +0100

    Don't fetch sets/groups/tags nor upload anything if not connected

 src/frogr-controller.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index af7753f..15c765d 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -1570,7 +1570,7 @@ _fetch_photosets (FrogrController *self)
 
   g_return_if_fail(FROGR_IS_CONTROLLER (self));
 
-  if (!frogr_controller_is_authorized (self))
+  if (!frogr_controller_is_connected (self))
     return;
 
   priv = FROGR_CONTROLLER_GET_PRIVATE (self);
@@ -1652,7 +1652,7 @@ _fetch_groups (FrogrController *self)
 
   g_return_if_fail(FROGR_IS_CONTROLLER (self));
 
-  if (!frogr_controller_is_authorized (self))
+  if (!frogr_controller_is_connected (self))
     return;
 
   priv = FROGR_CONTROLLER_GET_PRIVATE (self);
@@ -1874,7 +1874,7 @@ _fetch_tags (FrogrController *self)
 
   g_return_if_fail(FROGR_IS_CONTROLLER (self));
 
-  if (!frogr_controller_is_authorized (self))
+  if (!frogr_controller_is_connected (self))
     return;
 
   priv = FROGR_CONTROLLER_GET_PRIVATE (self);
@@ -2781,7 +2781,6 @@ frogr_controller_upload_pictures (FrogrController *self, GSList *pictures)
   if (!frogr_controller_is_authorized (self))
     {
       gchar *msg = NULL;
-
       msg = g_strdup_printf (_("You need to properly authorize %s before"
                                " uploading any pictures to Flickr.\n"
                                "Please re-authorize it."), APP_SHORTNAME);
@@ -2789,6 +2788,14 @@ frogr_controller_upload_pictures (FrogrController *self, GSList *pictures)
       frogr_util_show_error_dialog (GTK_WINDOW (priv->mainview), msg);
       g_free (msg);
     }
+  else if (!frogr_controller_is_connected (self))
+    {
+      gchar *msg = NULL;
+      msg = g_strdup_printf (_("You need to be connected before"
+                               " uploading any pictures to Flickr."));
+      frogr_util_show_error_dialog (GTK_WINDOW (priv->mainview), msg);
+      g_free (msg);
+    }
   else
     {
       UploadPicturesData *up_data = g_slice_new0 (UploadPicturesData);



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