[gnome-photos] selection-controller: Break a reference cycle

[Debarshi Ray <debarshir src gnome org>]

commit 820c59d9a701ae1bf8debf3e3f80b263e1011f5c
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Dec 14 20:24:26 2015 +0100

    selection-controller: Break a reference cycle

 src/photos-selection-controller.c |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/src/photos-selection-controller.c b/src/photos-selection-controller.c
index b7b19c5..449a842 100644
--- a/src/photos-selection-controller.c
+++ b/src/photos-selection-controller.c
@@ -1,6 +1,6 @@
 /*
  * Photos - access, organize and share your photos on GNOME
- * Copyright © 2012, 2014 Red Hat, Inc.
+ * Copyright © 2012, 2014, 2015 Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -100,17 +100,6 @@ photos_selection_controller_constructor (GType                  type,
 
 
 static void
-photos_selection_controller_dispose (GObject *object)
-{
-  PhotosSelectionController *self = PHOTOS_SELECTION_CONTROLLER (object);
-
-  g_clear_object (&self->priv->item_mngr);
-
-  G_OBJECT_CLASS (photos_selection_controller_parent_class)->dispose (object);
-}
-
-
-static void
 photos_selection_controller_finalize (GObject *object)
 {
   PhotosSelectionController *self = PHOTOS_SELECTION_CONTROLLER (object);
@@ -119,6 +108,9 @@ photos_selection_controller_finalize (GObject *object)
   if (priv->selection != NULL)
     g_list_free_full (priv->selection, g_free);
 
+  if (priv->item_mngr != NULL)
+    g_object_remove_weak_pointer (G_OBJECT (priv->item_mngr), (gpointer *) &priv->item_mngr);
+
   G_OBJECT_CLASS (photos_selection_controller_parent_class)->finalize (object);
 }
 
@@ -136,7 +128,8 @@ photos_selection_controller_init (PhotosSelectionController *self)
   app = g_application_get_default ();
   state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
 
-  priv->item_mngr = g_object_ref (state->item_mngr);
+  priv->item_mngr = state->item_mngr;
+  g_object_add_weak_pointer (G_OBJECT (priv->item_mngr), (gpointer *) &priv->item_mngr);
   g_signal_connect_object (priv->item_mngr,
                            "object-removed",
                            G_CALLBACK (photos_selection_controller_object_removed),
@@ -151,7 +144,6 @@ photos_selection_controller_class_init (PhotosSelectionControllerClass *class)
   GObjectClass *object_class = G_OBJECT_CLASS (class);
 
   object_class->constructor = photos_selection_controller_constructor;
-  object_class->dispose = photos_selection_controller_dispose;
   object_class->finalize = photos_selection_controller_finalize;
 
   signals[SELECTION_CHANGED] = g_signal_new ("selection-changed",