[frogr] Invalidate fetched data as soon as possible when fetching everything

[Mario Sanchez Prada <msanchez src gnome org>]

commit 7badcac21a051e326b39fb248ab6cee029205d33
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Sat Dec 29 08:55:27 2012 +0100

    Invalidate fetched data as soon as possible when fetching everything

 src/frogr-controller.c |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/src/frogr-controller.c b/src/frogr-controller.c
index 7294763..da4e149 100644
--- a/src/frogr-controller.c
+++ b/src/frogr-controller.c
@@ -201,6 +201,8 @@ static gboolean _cancel_authorization_on_timeout (gpointer data);
 
 static gboolean _should_retry_operation (GError *error, gint attempts);
 
+static void _invalidate_extra_data (FrogrController *self);
+
 static void _update_upload_progress (FrogrController *self, UploadPicturesData *up_data);
 
 static void _upload_next_picture (FrogrController *self, UploadPicturesData *up_data);
@@ -927,6 +929,17 @@ _should_retry_operation (GError *error, gint attempts)
 }
 
 static void
+_invalidate_extra_data (FrogrController *self)
+{
+  FrogrControllerPrivate *priv = FROGR_CONTROLLER_GET_PRIVATE (self);
+
+  /* Just reset the flags */
+  priv->photosets_fetched = FALSE;
+  priv->groups_fetched = FALSE;
+  priv->tags_fetched = FALSE;
+}
+
+static void
 _update_upload_progress (FrogrController *self, UploadPicturesData *up_data)
 {
   FrogrControllerPrivate *priv = FROGR_CONTROLLER_GET_PRIVATE (self);
@@ -1690,6 +1703,11 @@ _fetch_everything (FrogrController *self, gboolean force_extra_data)
   if (!frogr_controller_is_authorized (self))
     return;
 
+  /* Invalidate all fetched data as soon as possible if we already
+     know upfront we will force fetching it again later. */
+  if (force_extra_data)
+    _invalidate_extra_data (self);
+
   FetchAccountInfoData *data = g_slice_new0 (FetchAccountInfoData);
   data->retrieve_everything = TRUE;
   data->force_extra_data = force_extra_data;
@@ -1886,11 +1904,9 @@ _fetch_extra_data (FrogrController *self, gboolean force)
 
   priv = FROGR_CONTROLLER_GET_PRIVATE (self);
 
-  /* If we are forcing the retrieval of photosets, groups and tags,
-     make sure we are not fetching any data from the network at this
-     moment, or cancel otherwise, so the model is ready.*/
-  if (force && (priv->fetching_photosets || priv->fetching_groups || priv->fetching_tags))
-    frogr_controller_cancel_ongoing_requests (self);
+  /* Invalidate all fetched data. */
+  if (force)
+    _invalidate_extra_data (self);
 
   /* Sets, groups and tags can take much longer to retrieve,
      so we only retrieve that if actually needed */