[frogr] New internal helper function _remove_pictures()

[Mario Sanchez Prada <msanchez src gnome org>]

commit f6c82ade1e8b32bf754ee62df69d2665f0964918
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Sat Nov 10 02:04:25 2012 +0100

    New internal helper function _remove_pictures()

 src/frogr-main-view-model.c |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/src/frogr-main-view-model.c b/src/frogr-main-view-model.c
index 70915e4..0ec9e29 100644
--- a/src/frogr-main-view-model.c
+++ b/src/frogr-main-view-model.c
@@ -137,6 +137,29 @@ _remove_local_photosets (FrogrMainViewModel *self)
 }
 
 static void
+_remove_pictures (FrogrMainViewModel *self)
+{
+  FrogrMainViewModelPrivate *priv = NULL;
+  FrogrPicture *picture = NULL;
+
+  g_return_if_fail(FROGR_IS_MAIN_VIEW_MODEL (self));
+
+  priv = FROGR_MAIN_VIEW_MODEL_GET_PRIVATE (self);
+  while (priv->pictures)
+    {
+      picture = FROGR_PICTURE (priv->pictures->data);
+      priv->pictures = g_slist_remove (priv->pictures, picture);
+      g_signal_emit (self, signals[PICTURE_REMOVED], 0, picture);
+      g_object_unref (picture);
+    }
+
+  g_slist_free (priv->pictures);
+  priv->pictures = NULL;
+
+  g_signal_emit (self, signals[MODEL_CHANGED], 0);
+}
+
+static void
 _remove_all_photosets (FrogrMainViewModel *self)
 {
   FrogrMainViewModelPrivate *priv = NULL;
@@ -299,13 +322,7 @@ _frogr_main_view_model_dispose (GObject* object)
   FrogrMainViewModel *self = FROGR_MAIN_VIEW_MODEL (object);
   FrogrMainViewModelPrivate *priv = FROGR_MAIN_VIEW_MODEL_GET_PRIVATE (object);
 
-  if (priv->pictures)
-    {
-      g_slist_foreach (priv->pictures, (GFunc)g_object_unref, NULL);
-      g_slist_free (priv->pictures);
-      priv->pictures = NULL;
-    }
-
+  _remove_pictures (self);
   _remove_all_photosets (self);
   _remove_groups (self);
   _remove_all_tags (self);
@@ -836,5 +853,6 @@ frogr_main_view_model_deserialize (FrogrMainViewModel *self, JsonNode *json_node
                     self);
 
   /* Load the pictures! */
+  _remove_pictures (self);
   frogr_file_loader_load (loader);
 }