[gnome-photos/wip/facebook] Rename all singleton public constructors to _dup_singleton()



commit 9cc0e33cd5547b8fe64a65b64b6422229de7de12
Author: Emanuele Aina <emanuele aina collabora com>
Date:   Fri Jun 28 19:48:02 2013 +0200

    Rename all singleton public constructors to _dup_singleton()
    
    Using _dup_singleton() instead of _new() makes more clear that we're not
    really allocating a new object, but just taking a reference to an
    already existing one.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703280

 src/photos-application.c                    |    8 ++++----
 src/photos-base-item.c                      |    2 +-
 src/photos-camera-cache.c                   |    4 ++--
 src/photos-camera-cache.h                   |    2 +-
 src/photos-collection-icon-watcher.c        |    4 ++--
 src/photos-collection-manager.c             |    2 +-
 src/photos-collection-manager.h             |    2 +-
 src/photos-create-collection-job.c          |    2 +-
 src/photos-delete-item-job.c                |    2 +-
 src/photos-dlna-renderers-dialog.c          |    4 ++--
 src/photos-embed.c                          |   12 ++++++------
 src/photos-fetch-collection-state-job.c     |    8 ++++----
 src/photos-fetch-collections-job.c          |    2 +-
 src/photos-flickr-item.c                    |    2 +-
 src/photos-indexing-notification.c          |    2 +-
 src/photos-item-manager.c                   |    6 +++---
 src/photos-item-manager.h                   |    2 +-
 src/photos-load-more-button.c               |    6 +++---
 src/photos-main-toolbar.c                   |   10 +++++-----
 src/photos-main-window.c                    |    4 ++--
 src/photos-mode-controller.c                |    2 +-
 src/photos-mode-controller.h                |    2 +-
 src/photos-notification-manager.c           |    2 +-
 src/photos-notification-manager.h           |    2 +-
 src/photos-offset-collections-controller.c  |    4 ++--
 src/photos-offset-collections-controller.h  |    2 +-
 src/photos-offset-controller.c              |    2 +-
 src/photos-offset-favorites-controller.c    |    4 ++--
 src/photos-offset-favorites-controller.h    |    2 +-
 src/photos-offset-overview-controller.c     |    2 +-
 src/photos-offset-overview-controller.h     |    2 +-
 src/photos-organize-collection-model.c      |    2 +-
 src/photos-organize-collection-view.c       |    4 ++--
 src/photos-preview-nav-buttons.c            |    2 +-
 src/photos-preview-view.c                   |    2 +-
 src/photos-properties-dialog.c              |    4 ++--
 src/photos-query-builder.c                  |   16 ++++++++--------
 src/photos-query.c                          |    2 +-
 src/photos-search-type-manager.c            |    2 +-
 src/photos-search-type-manager.h            |    2 +-
 src/photos-selection-controller.c           |    4 ++--
 src/photos-selection-controller.h           |    2 +-
 src/photos-selection-toolbar.c              |    4 ++--
 src/photos-set-collection-job.c             |    4 ++--
 src/photos-single-item-job.c                |    2 +-
 src/photos-source-manager.c                 |    2 +-
 src/photos-source-manager.h                 |    2 +-
 src/photos-tracker-change-monitor.c         |    4 ++--
 src/photos-tracker-change-monitor.h         |    2 +-
 src/photos-tracker-collections-controller.c |    6 +++---
 src/photos-tracker-collections-controller.h |    2 +-
 src/photos-tracker-controller.c             |    8 ++++----
 src/photos-tracker-favorites-controller.c   |    6 +++---
 src/photos-tracker-favorites-controller.h   |    2 +-
 src/photos-tracker-overview-controller.c    |    4 ++--
 src/photos-tracker-overview-controller.h    |    2 +-
 src/photos-tracker-queue.c                  |    2 +-
 src/photos-tracker-queue.h                  |    2 +-
 src/photos-update-mtime-job.c               |    2 +-
 src/photos-utils.c                          |    4 ++--
 src/photos-view-container.c                 |   12 ++++++------
 src/photos-view-model.c                     |    4 ++--
 62 files changed, 115 insertions(+), 115 deletions(-)
---
diff --git a/src/photos-application.c b/src/photos-application.c
index 21bc10b..139640a 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -421,15 +421,15 @@ photos_application_startup (GApplication *application)
                                                          NULL,
                                                          NULL);
 
-  priv->item_mngr = photos_item_manager_new ();
-  priv->src_mngr = photos_source_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
+  priv->src_mngr = photos_source_manager_dup_singleton ();
 
   /* A dummy reference to keep it alive during the lifetime of the
    * application.
    */
-  priv->camera_cache = photos_camera_cache_new ();
+  priv->camera_cache = photos_camera_cache_dup_singleton ();
 
-  priv->mode_cntrlr = photos_mode_controller_new ();
+  priv->mode_cntrlr = photos_mode_controller_dup_singleton ();
 
   action = g_simple_action_new ("about", NULL);
   g_signal_connect_swapped (action, "activate", G_CALLBACK (photos_main_window_show_about), 
priv->main_window);
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index 463ccb8..c46a35f 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -896,7 +896,7 @@ photos_base_item_init (PhotosBaseItem *self)
   g_mutex_init (&priv->mutex_download);
   g_mutex_init (&priv->mutex);
 
-  priv->sel_cntrlr = photos_selection_controller_new ();
+  priv->sel_cntrlr = photos_selection_controller_dup_singleton ();
 }
 
 
diff --git a/src/photos-camera-cache.c b/src/photos-camera-cache.c
index 1f96e77..64e5950 100644
--- a/src/photos-camera-cache.c
+++ b/src/photos-camera-cache.c
@@ -155,7 +155,7 @@ photos_camera_cache_init (PhotosCameraCache *self)
   priv = self->priv;
 
   priv->cache = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
@@ -171,7 +171,7 @@ photos_camera_cache_class_init (PhotosCameraCacheClass *class)
 
 
 PhotosCameraCache *
-photos_camera_cache_new (void)
+photos_camera_cache_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_CAMERA_CACHE, NULL);
 }
diff --git a/src/photos-camera-cache.h b/src/photos-camera-cache.h
index f3cc6d7..d983f81 100644
--- a/src/photos-camera-cache.h
+++ b/src/photos-camera-cache.h
@@ -65,7 +65,7 @@ struct _PhotosCameraCacheClass
 
 GType                  photos_camera_cache_get_type               (void) G_GNUC_CONST;
 
-PhotosCameraCache     *photos_camera_cache_new                    (void);
+PhotosCameraCache     *photos_camera_cache_dup_singleton          (void);
 
 void                   photos_camera_cache_get_camera_async       (PhotosCameraCache *self,
                                                                    GQuark id,
diff --git a/src/photos-collection-icon-watcher.c b/src/photos-collection-icon-watcher.c
index 741127e..18d1b74 100644
--- a/src/photos-collection-icon-watcher.c
+++ b/src/photos-collection-icon-watcher.c
@@ -387,8 +387,8 @@ photos_collection_icon_watcher_init (PhotosCollectionIconWatcher *self)
   priv = self->priv;
 
   priv->item_connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_object_unref);
-  priv->item_mngr = photos_item_manager_new ();
-  priv->queue = photos_tracker_queue_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-collection-manager.c b/src/photos-collection-manager.c
index 12c1236..62e3289 100644
--- a/src/photos-collection-manager.c
+++ b/src/photos-collection-manager.c
@@ -69,7 +69,7 @@ photos_collection_manager_class_init (PhotosCollectionManagerClass *class)
 
 
 PhotosBaseManager *
-photos_collection_manager_new (void)
+photos_collection_manager_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_COLLECTION_MANAGER, NULL);
 }
diff --git a/src/photos-collection-manager.h b/src/photos-collection-manager.h
index 535eec6..e49c86e 100644
--- a/src/photos-collection-manager.h
+++ b/src/photos-collection-manager.h
@@ -68,7 +68,7 @@ struct _PhotosCollectionManagerClass
 
 GType                     photos_collection_manager_get_type           (void) G_GNUC_CONST;
 
-PhotosBaseManager        *photos_collection_manager_new                (void);
+PhotosBaseManager        *photos_collection_manager_dup_singleton      (void);
 
 gchar                    *photos_collection_manager_get_where          (PhotosCollectionManager *self);
 
diff --git a/src/photos-create-collection-job.c b/src/photos-create-collection-job.c
index 9221b15..ca33b28 100644
--- a/src/photos-create-collection-job.c
+++ b/src/photos-create-collection-job.c
@@ -157,7 +157,7 @@ photos_create_collection_job_init (PhotosCreateCollectionJob *self)
   self->priv = photos_create_collection_job_get_instance_private (self);
   priv = self->priv;
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-delete-item-job.c b/src/photos-delete-item-job.c
index b7a4693..46bde65 100644
--- a/src/photos-delete-item-job.c
+++ b/src/photos-delete-item-job.c
@@ -123,7 +123,7 @@ photos_delete_item_job_init (PhotosDeleteItemJob *self)
   self->priv = photos_delete_item_job_get_instance_private (self);
   priv = self->priv;
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-dlna-renderers-dialog.c b/src/photos-dlna-renderers-dialog.c
index b2a4309..3124f75 100644
--- a/src/photos-dlna-renderers-dialog.c
+++ b/src/photos-dlna-renderers-dialog.c
@@ -227,10 +227,10 @@ photos_dlna_renderers_dialog_init (PhotosDlnaRenderersDialog *self)
                                             PHOTOS_TYPE_DLNA_RENDERERS_DIALOG,
                                             PhotosDlnaRenderersDialogPrivate);
   priv = self->priv;
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
   priv->renderers_mngr = photos_dlna_renderers_manager_dup_singleton ();
   priv->remote_mngr = photos_remote_display_manager_dup_singleton ();
-  priv->mode_cntrlr = photos_mode_controller_new ();
+  priv->mode_cntrlr = photos_mode_controller_dup_singleton ();
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
diff --git a/src/photos-embed.c b/src/photos-embed.c
index 537cd38..4520499 100644
--- a/src/photos-embed.c
+++ b/src/photos-embed.c
@@ -492,7 +492,7 @@ photos_embed_init (PhotosEmbed *self)
   priv->toolbar = photos_main_toolbar_new ();
   photos_main_toolbar_set_stack (PHOTOS_MAIN_TOOLBAR (priv->toolbar), GTK_STACK (priv->stack));
 
-  priv->ntfctn_mngr = g_object_ref_sink (photos_notification_manager_new ());
+  priv->ntfctn_mngr = g_object_ref_sink (photos_notification_manager_dup_singleton ());
   gtk_overlay_add_overlay (GTK_OVERLAY (priv->stack_overlay), priv->ntfctn_mngr);
 
   priv->indexing_ntfctn = g_object_ref_sink (photos_indexing_notification_new ());
@@ -525,7 +525,7 @@ photos_embed_init (PhotosEmbed *self)
                            G_CALLBACK (photos_embed_notify_visible_child),
                            self, G_CONNECT_SWAPPED);
 
-  priv->mode_cntrlr = photos_mode_controller_new ();
+  priv->mode_cntrlr = photos_mode_controller_dup_singleton ();
   g_signal_connect (priv->mode_cntrlr,
                     "window-mode-changed",
                     G_CALLBACK (photos_embed_window_mode_changed),
@@ -535,23 +535,23 @@ photos_embed_init (PhotosEmbed *self)
                     G_CALLBACK (photos_embed_fullscreen_changed),
                     self);
 
-  priv->trk_ovrvw_cntrlr = photos_tracker_overview_controller_new ();
+  priv->trk_ovrvw_cntrlr = photos_tracker_overview_controller_dup_singleton ();
   g_signal_connect_swapped (priv->trk_ovrvw_cntrlr, "query-error", G_CALLBACK (photos_embed_query_error), 
self);
   g_signal_connect (priv->trk_ovrvw_cntrlr,
                     "query-status-changed",
                     G_CALLBACK (photos_embed_query_status_changed),
                     self);
 
-  priv->offset_cntrlr = photos_offset_overview_controller_new ();
+  priv->offset_cntrlr = photos_offset_overview_controller_dup_singleton ();
   g_signal_connect_swapped (priv->offset_cntrlr, "count-changed", G_CALLBACK (photos_embed_count_changed), 
self);
 
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
   g_signal_connect (priv->item_mngr, "active-changed", G_CALLBACK (photos_embed_active_changed), self);
 
   querying = photos_tracker_controller_get_query_status (priv->trk_ovrvw_cntrlr);
   photos_embed_query_status_changed (priv->trk_ovrvw_cntrlr, querying, self);
 
-  priv->monitor = photos_tracker_change_monitor_new ();
+  priv->monitor = photos_tracker_change_monitor_dup_singleton ();
 
   gtk_widget_show (GTK_WIDGET (self));
 }
diff --git a/src/photos-fetch-collection-state-job.c b/src/photos-fetch-collection-state-job.c
index 894be76..5ee6ec4 100644
--- a/src/photos-fetch-collection-state-job.c
+++ b/src/photos-fetch-collection-state-job.c
@@ -226,10 +226,10 @@ photos_fetch_collection_state_job_init (PhotosFetchCollectionStateJob *self)
                                                        g_free,
                                                        photos_fetch_collection_state_job_value_destroy_func);
 
-  priv->col_mngr = photos_collection_manager_new ();
-  priv->item_mngr = photos_item_manager_new ();
-  priv->sel_cntrlr = photos_selection_controller_new ();
-  priv->queue = photos_tracker_queue_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
+  priv->sel_cntrlr = photos_selection_controller_dup_singleton ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-fetch-collections-job.c b/src/photos-fetch-collections-job.c
index 71702f6..84360ae 100644
--- a/src/photos-fetch-collections-job.c
+++ b/src/photos-fetch-collections-job.c
@@ -179,7 +179,7 @@ photos_fetch_collections_job_init (PhotosFetchCollectionsJob *self)
   self->priv = photos_fetch_collections_job_get_instance_private (self);
   priv = self->priv;
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-flickr-item.c b/src/photos-flickr-item.c
index 329e6e8..223bfce 100644
--- a/src/photos-flickr-item.c
+++ b/src/photos-flickr-item.c
@@ -342,7 +342,7 @@ photos_flickr_item_init (PhotosFlickrItem *self)
   self->priv = photos_flickr_item_get_instance_private (self);
   priv = self->priv;
 
-  priv->src_mngr = photos_source_manager_new ();
+  priv->src_mngr = photos_source_manager_dup_singleton ();
 }
 
 
diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c
index f459901..5a03b84 100644
--- a/src/photos-indexing-notification.c
+++ b/src/photos-indexing-notification.c
@@ -154,7 +154,7 @@ photos_indexing_notification_init (PhotosIndexingNotification *self)
       return;
     }
 
-  priv->ntfctn_mngr = g_object_ref_sink (photos_notification_manager_new ());
+  priv->ntfctn_mngr = g_object_ref_sink (photos_notification_manager_dup_singleton ());
 
   priv->spinner = gtk_spinner_new ();
   gtk_widget_set_size_request (priv->spinner, 16, 16);
diff --git a/src/photos-item-manager.c b/src/photos-item-manager.c
index a52594d..3755032 100644
--- a/src/photos-item-manager.c
+++ b/src/photos-item-manager.c
@@ -209,9 +209,9 @@ photos_item_manager_init (PhotosItemManager *self)
   priv = self->priv;
 
   priv->collection_path = g_queue_new ();
-  priv->col_mngr = photos_collection_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
 
-  priv->monitor = photos_tracker_change_monitor_new ();
+  priv->monitor = photos_tracker_change_monitor_dup_singleton ();
   g_signal_connect (priv->monitor, "changes-pending", G_CALLBACK (photos_item_manager_changes_pending), 
self);
 }
 
@@ -229,7 +229,7 @@ photos_item_manager_class_init (PhotosItemManagerClass *class)
 
 
 PhotosBaseManager *
-photos_item_manager_new (void)
+photos_item_manager_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_ITEM_MANAGER, NULL);
 }
diff --git a/src/photos-item-manager.h b/src/photos-item-manager.h
index f276368..5d514f9 100644
--- a/src/photos-item-manager.h
+++ b/src/photos-item-manager.h
@@ -72,7 +72,7 @@ struct _PhotosItemManagerClass
 
 GType                     photos_item_manager_get_type           (void) G_GNUC_CONST;
 
-PhotosBaseManager        *photos_item_manager_new                (void);
+PhotosBaseManager        *photos_item_manager_dup_singleton      (void);
 
 void                      photos_item_manager_activate_previous_collection (PhotosItemManager *self);
 
diff --git a/src/photos-load-more-button.c b/src/photos-load-more-button.c
index 7d6a1ae..365856e 100644
--- a/src/photos-load-more-button.c
+++ b/src/photos-load-more-button.c
@@ -102,15 +102,15 @@ photos_load_more_button_constructed (GObject *object)
   switch (priv->mode)
     {
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
-      priv->offset_cntrlr = photos_offset_collections_controller_new ();
+      priv->offset_cntrlr = photos_offset_collections_controller_dup_singleton ();
       break;
 
     case PHOTOS_WINDOW_MODE_FAVORITES:
-      priv->offset_cntrlr = photos_offset_favorites_controller_new ();
+      priv->offset_cntrlr = photos_offset_favorites_controller_dup_singleton ();
       break;
 
     case PHOTOS_WINDOW_MODE_OVERVIEW:
-      priv->offset_cntrlr = photos_offset_overview_controller_new ();
+      priv->offset_cntrlr = photos_offset_overview_controller_dup_singleton ();
       break;
 
     default:
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index 25a4942..fe7c3e4 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -615,17 +615,17 @@ photos_main_toolbar_init (PhotosMainToolbar *self)
   photos_header_bar_set_selection_menu (PHOTOS_HEADER_BAR (priv->toolbar),
                                         GD_HEADER_BUTTON (priv->selection_menu));
 
-  priv->col_mngr = photos_collection_manager_new ();
-  priv->item_mngr = photos_item_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
 
-  priv->src_mngr = photos_source_manager_new ();
+  priv->src_mngr = photos_source_manager_dup_singleton ();
   g_signal_connect_object (priv->src_mngr,
                            "active-changed",
                            G_CALLBACK (photos_main_toolbar_set_toolbar_title),
                            self,
                            G_CONNECT_SWAPPED);
 
-  priv->mode_cntrlr = photos_mode_controller_new ();
+  priv->mode_cntrlr = photos_mode_controller_dup_singleton ();
   priv->old_mode = PHOTOS_WINDOW_MODE_NONE;
   g_signal_connect_object (priv->mode_cntrlr,
                            "window-mode-changed",
@@ -633,7 +633,7 @@ photos_main_toolbar_init (PhotosMainToolbar *self)
                            self,
                            G_CONNECT_SWAPPED);
 
-  priv->sel_cntrlr = photos_selection_controller_new ();
+  priv->sel_cntrlr = photos_selection_controller_dup_singleton ();
   g_signal_connect_object (priv->sel_cntrlr,
                            "selection-mode-changed",
                            G_CALLBACK (photos_main_toolbar_reset_toolbar_mode),
diff --git a/src/photos-main-window.c b/src/photos-main-window.c
index 57748f6..e1a59a8 100644
--- a/src/photos-main-window.c
+++ b/src/photos-main-window.c
@@ -272,9 +272,9 @@ photos_main_window_init (PhotosMainWindow *self)
   if (maximized)
     gtk_window_maximize (GTK_WINDOW (self));
 
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
 
-  priv->controller = photos_mode_controller_new ();
+  priv->controller = photos_mode_controller_dup_singleton ();
   g_signal_connect (priv->controller,
                     "fullscreen-changed",
                     G_CALLBACK (photos_main_window_fullscreen_changed),
diff --git a/src/photos-mode-controller.c b/src/photos-mode-controller.c
index 3ce0242..36ad32b 100644
--- a/src/photos-mode-controller.c
+++ b/src/photos-mode-controller.c
@@ -132,7 +132,7 @@ photos_mode_controller_class_init (PhotosModeControllerClass *class)
 
 
 PhotosModeController *
-photos_mode_controller_new (void)
+photos_mode_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_MODE_CONTROLLER, NULL);
 }
diff --git a/src/photos-mode-controller.h b/src/photos-mode-controller.h
index 94e0532..a86913e 100644
--- a/src/photos-mode-controller.h
+++ b/src/photos-mode-controller.h
@@ -81,7 +81,7 @@ struct _PhotosModeControllerClass
 
 GType                  photos_mode_controller_get_type               (void) G_GNUC_CONST;
 
-PhotosModeController  *photos_mode_controller_new                    (void);
+PhotosModeController  *photos_mode_controller_dup_singleton          (void);
 
 PhotosWindowMode       photos_mode_controller_get_can_fullscreen     (PhotosModeController *self);
 
diff --git a/src/photos-notification-manager.c b/src/photos-notification-manager.c
index e52aa1d..032916b 100644
--- a/src/photos-notification-manager.c
+++ b/src/photos-notification-manager.c
@@ -106,7 +106,7 @@ photos_notification_manager_class_init (PhotosNotificationManagerClass *class)
 
 
 GtkWidget *
-photos_notification_manager_new (void)
+photos_notification_manager_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_NOTIFICATION_MANAGER, "show-close-button", FALSE, "timeout", -1, NULL);
 }
diff --git a/src/photos-notification-manager.h b/src/photos-notification-manager.h
index 4ca0aeb..00c2110 100644
--- a/src/photos-notification-manager.h
+++ b/src/photos-notification-manager.h
@@ -68,7 +68,7 @@ struct _PhotosNotificationManagerClass
 
 GType               photos_notification_manager_get_type           (void) G_GNUC_CONST;
 
-GtkWidget          *photos_notification_manager_new                (void);
+GtkWidget          *photos_notification_manager_dup_singleton      (void);
 
 void                photos_notification_manager_add_notification   (PhotosNotificationManager *self,
                                                                     GtkWidget *notification);
diff --git a/src/photos-offset-collections-controller.c b/src/photos-offset-collections-controller.c
index fc4bc61..3b57a32 100644
--- a/src/photos-offset-collections-controller.c
+++ b/src/photos-offset-collections-controller.c
@@ -97,7 +97,7 @@ photos_offset_collections_controller_init (PhotosOffsetCollectionsController *se
   self->priv = photos_offset_collections_controller_get_instance_private (self);
   priv = self->priv;
 
-  priv->col_mngr = photos_collection_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
 }
 
 
@@ -114,7 +114,7 @@ photos_offset_collections_controller_class_init (PhotosOffsetCollectionsControll
 
 
 PhotosOffsetController *
-photos_offset_collections_controller_new (void)
+photos_offset_collections_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_OFFSET_COLLECTIONS_CONTROLLER, NULL);
 }
diff --git a/src/photos-offset-collections-controller.h b/src/photos-offset-collections-controller.h
index fac50c1..ef9272f 100644
--- a/src/photos-offset-collections-controller.h
+++ b/src/photos-offset-collections-controller.h
@@ -68,7 +68,7 @@ struct _PhotosOffsetCollectionsControllerClass
 
 GType                    photos_offset_collections_controller_get_type          (void) G_GNUC_CONST;
 
-PhotosOffsetController  *photos_offset_collections_controller_new               (void);
+PhotosOffsetController  *photos_offset_collections_controller_dup_singleton     (void);
 
 G_END_DECLS
 
diff --git a/src/photos-offset-controller.c b/src/photos-offset-controller.c
index 796bbc0..a673fb0 100644
--- a/src/photos-offset-controller.c
+++ b/src/photos-offset-controller.c
@@ -119,7 +119,7 @@ photos_offset_controller_init (PhotosOffsetController *self)
   self->priv = photos_offset_controller_get_instance_private (self);
   priv = self->priv;
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-offset-favorites-controller.c b/src/photos-offset-favorites-controller.c
index fd72daf..f4cd085 100644
--- a/src/photos-offset-favorites-controller.c
+++ b/src/photos-offset-favorites-controller.c
@@ -97,7 +97,7 @@ photos_offset_favorites_controller_init (PhotosOffsetFavoritesController *self)
   self->priv = photos_offset_favorites_controller_get_instance_private (self);
   priv = self->priv;
 
-  priv->col_mngr = photos_collection_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
 }
 
 
@@ -114,7 +114,7 @@ photos_offset_favorites_controller_class_init (PhotosOffsetFavoritesControllerCl
 
 
 PhotosOffsetController *
-photos_offset_favorites_controller_new (void)
+photos_offset_favorites_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_OFFSET_FAVORITES_CONTROLLER, NULL);
 }
diff --git a/src/photos-offset-favorites-controller.h b/src/photos-offset-favorites-controller.h
index 15cf843..2d9c68c 100644
--- a/src/photos-offset-favorites-controller.h
+++ b/src/photos-offset-favorites-controller.h
@@ -68,7 +68,7 @@ struct _PhotosOffsetFavoritesControllerClass
 
 GType                    photos_offset_favorites_controller_get_type          (void) G_GNUC_CONST;
 
-PhotosOffsetController  *photos_offset_favorites_controller_new               (void);
+PhotosOffsetController  *photos_offset_favorites_controller_dup_singleton     (void);
 
 G_END_DECLS
 
diff --git a/src/photos-offset-overview-controller.c b/src/photos-offset-overview-controller.c
index 33bf550..4ea41f0 100644
--- a/src/photos-offset-overview-controller.c
+++ b/src/photos-offset-overview-controller.c
@@ -77,7 +77,7 @@ photos_offset_overview_controller_class_init (PhotosOffsetOverviewControllerClas
 
 
 PhotosOffsetController *
-photos_offset_overview_controller_new (void)
+photos_offset_overview_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_OFFSET_OVERVIEW_CONTROLLER, NULL);
 }
diff --git a/src/photos-offset-overview-controller.h b/src/photos-offset-overview-controller.h
index fab1482..5a8829b 100644
--- a/src/photos-offset-overview-controller.h
+++ b/src/photos-offset-overview-controller.h
@@ -66,7 +66,7 @@ struct _PhotosOffsetOverviewControllerClass
 
 GType                    photos_offset_overview_controller_get_type          (void) G_GNUC_CONST;
 
-PhotosOffsetController  *photos_offset_overview_controller_new               (void);
+PhotosOffsetController  *photos_offset_overview_controller_dup_singleton     (void);
 
 G_END_DECLS
 
diff --git a/src/photos-organize-collection-model.c b/src/photos-organize-collection-model.c
index 9969c20..be269ef 100644
--- a/src/photos-organize-collection-model.c
+++ b/src/photos-organize-collection-model.c
@@ -203,7 +203,7 @@ photos_organize_collection_model_init (PhotosOrganizeCollectionModel *self)
 
   gtk_list_store_set_column_types (GTK_LIST_STORE (self), sizeof (columns) / sizeof (columns[0]), columns);
 
-  priv->manager = photos_collection_manager_new ();
+  priv->manager = photos_collection_manager_dup_singleton ();
 
   g_signal_connect_object (priv->manager,
                            "object-added",
diff --git a/src/photos-organize-collection-view.c b/src/photos-organize-collection-view.c
index 7ea696e..49f3531 100644
--- a/src/photos-organize-collection-view.c
+++ b/src/photos-organize-collection-view.c
@@ -328,8 +328,8 @@ photos_organize_collection_view_init (PhotosOrganizeCollectionView *self)
                                            self,
                                            NULL);
 
-  priv->col_mngr = photos_collection_manager_new ();
-  priv->src_mngr = photos_source_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
+  priv->src_mngr = photos_source_manager_dup_singleton ();
 
   gtk_widget_show (GTK_WIDGET (self));
 }
diff --git a/src/photos-preview-nav-buttons.c b/src/photos-preview-nav-buttons.c
index c1ad36f..7d4daa3 100644
--- a/src/photos-preview-nav-buttons.c
+++ b/src/photos-preview-nav-buttons.c
@@ -488,7 +488,7 @@ photos_preview_nav_buttons_init (PhotosPreviewNavButtons *self)
   self->priv = photos_preview_nav_buttons_get_instance_private (self);
   priv = self->priv;
 
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
   g_signal_connect_swapped (priv->item_mngr,
                             "active-changed",
                             G_CALLBACK (photos_preview_nav_buttons_active_changed),
diff --git a/src/photos-preview-view.c b/src/photos-preview-view.c
index 082b55b..00e629b 100644
--- a/src/photos-preview-view.c
+++ b/src/photos-preview-view.c
@@ -188,7 +188,7 @@ photos_preview_view_init (PhotosPreviewView *self)
   self->priv = photos_preview_view_get_instance_private (self);
   priv = self->priv;
 
-  priv->mode_cntrlr = photos_mode_controller_new ();
+  priv->mode_cntrlr = photos_mode_controller_dup_singleton ();
   g_signal_connect_swapped (priv->mode_cntrlr,
                             "window-mode-changed",
                             G_CALLBACK (photos_preview_view_window_mode_changed),
diff --git a/src/photos-properties-dialog.c b/src/photos-properties-dialog.c
index adaae7a..d49f86e 100644
--- a/src/photos-properties-dialog.c
+++ b/src/photos-properties-dialog.c
@@ -602,8 +602,8 @@ photos_properties_dialog_init (PhotosPropertiesDialog *self)
   priv = self->priv;
 
   priv->cancellable = g_cancellable_new ();
-  priv->item_mngr = photos_item_manager_new ();
-  priv->camera_cache = photos_camera_cache_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
+  priv->camera_cache = photos_camera_cache_dup_singleton ();
 
   gtk_dialog_add_button (GTK_DIALOG (self), _("Done"), GTK_RESPONSE_OK);
   gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
index 2755876..16958da 100644
--- a/src/photos-query-builder.c
+++ b/src/photos-query-builder.c
@@ -59,7 +59,7 @@ photos_query_builder_set_search_type (gint flags)
 {
   PhotosBaseManager *srch_typ_mngr;
 
-  srch_typ_mngr = photos_search_type_manager_new ();
+  srch_typ_mngr = photos_search_type_manager_dup_singleton ();
 
   if (flags & PHOTOS_QUERY_FLAGS_COLLECTIONS)
     photos_base_manager_set_active_object_by_id (srch_typ_mngr, PHOTOS_SEARCH_TYPE_STOCK_COLLECTIONS);
@@ -81,10 +81,10 @@ photos_query_builder_filter (gint flags)
   gchar *src_mngr_filter;
   gchar *srch_typ_mngr_filter;
 
-  src_mngr = photos_source_manager_new ();
+  src_mngr = photos_source_manager_dup_singleton ();
   src_mngr_filter = photos_base_manager_get_filter (src_mngr);
 
-  srch_typ_mngr = photos_search_type_manager_new ();
+  srch_typ_mngr = photos_search_type_manager_dup_singleton ();
   photos_query_builder_set_search_type (flags);
   srch_typ_mngr_filter = photos_base_manager_get_filter (srch_typ_mngr);
 
@@ -120,9 +120,9 @@ photos_query_builder_where (gboolean global, gint flags)
   gchar *sparql;
   gchar *srch_typ_mngr_where = NULL;
 
-  col_mngr = photos_collection_manager_new ();
+  col_mngr = photos_collection_manager_dup_singleton ();
 
-  srch_typ_mngr = photos_search_type_manager_new ();
+  srch_typ_mngr = photos_search_type_manager_dup_singleton ();
   photos_query_builder_set_search_type (flags);
   srch_typ_mngr_where = photos_search_type_manager_get_where (PHOTOS_SEARCH_TYPE_MANAGER (srch_typ_mngr));
 
@@ -173,11 +173,11 @@ photos_query_builder_query (gboolean global, gint flags)
       gint step;
 
       if (flags & PHOTOS_QUERY_FLAGS_COLLECTIONS)
-        offset_cntrlr = photos_offset_collections_controller_new ();
+        offset_cntrlr = photos_offset_collections_controller_dup_singleton ();
       else if (flags & PHOTOS_QUERY_FLAGS_FAVORITES)
-        offset_cntrlr = photos_offset_favorites_controller_new ();
+        offset_cntrlr = photos_offset_favorites_controller_dup_singleton ();
       else
-        offset_cntrlr = photos_offset_overview_controller_new ();
+        offset_cntrlr = photos_offset_overview_controller_dup_singleton ();
 
       offset = photos_offset_controller_get_offset (offset_cntrlr);
       step = photos_offset_controller_get_step (offset_cntrlr);
diff --git a/src/photos-query.c b/src/photos-query.c
index 06d9b2e..7571360 100644
--- a/src/photos-query.c
+++ b/src/photos-query.c
@@ -42,7 +42,7 @@ photos_query_new (gchar *sparql)
 
   query = g_slice_new0 (PhotosQuery);
 
-  src_mngr = photos_source_manager_new ();
+  src_mngr = photos_source_manager_dup_singleton ();
   active_object = photos_base_manager_get_active_object (src_mngr);
   if (active_object != NULL)
     query->source = PHOTOS_SOURCE (g_object_ref (active_object));
diff --git a/src/photos-search-type-manager.c b/src/photos-search-type-manager.c
index 5abd97e..3c38afc 100644
--- a/src/photos-search-type-manager.c
+++ b/src/photos-search-type-manager.c
@@ -113,7 +113,7 @@ photos_search_type_manager_class_init (PhotosSearchTypeManagerClass *class)
 
 
 PhotosBaseManager *
-photos_search_type_manager_new (void)
+photos_search_type_manager_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_SEARCH_TYPE_MANAGER, NULL);
 }
diff --git a/src/photos-search-type-manager.h b/src/photos-search-type-manager.h
index 4b839e2..6fafe65 100644
--- a/src/photos-search-type-manager.h
+++ b/src/photos-search-type-manager.h
@@ -68,7 +68,7 @@ struct _PhotosSearchTypeManagerClass
 
 GType                     photos_search_type_manager_get_type           (void) G_GNUC_CONST;
 
-PhotosBaseManager        *photos_search_type_manager_new                (void);
+PhotosBaseManager        *photos_search_type_manager_dup_singleton      (void);
 
 gchar                    *photos_search_type_manager_get_where          (PhotosSearchTypeManager *self);
 
diff --git a/src/photos-selection-controller.c b/src/photos-selection-controller.c
index 05d8914..3be0ad4 100644
--- a/src/photos-selection-controller.c
+++ b/src/photos-selection-controller.c
@@ -131,7 +131,7 @@ photos_selection_controller_init (PhotosSelectionController *self)
   self->priv = photos_selection_controller_get_instance_private (self);
   priv = self->priv;
 
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
   g_signal_connect (priv->item_mngr,
                     "object-removed",
                     G_CALLBACK (photos_selection_controller_object_removed),
@@ -174,7 +174,7 @@ photos_selection_controller_class_init (PhotosSelectionControllerClass *class)
 
 
 PhotosSelectionController *
-photos_selection_controller_new (void)
+photos_selection_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_SELECTION_CONTROLLER, NULL);
 }
diff --git a/src/photos-selection-controller.h b/src/photos-selection-controller.h
index 82d038d..efbe0e4 100644
--- a/src/photos-selection-controller.h
+++ b/src/photos-selection-controller.h
@@ -71,7 +71,7 @@ struct _PhotosSelectionControllerClass
 
 GType                       photos_selection_controller_get_type           (void) G_GNUC_CONST;
 
-PhotosSelectionController  *photos_selection_controller_new                (void);
+PhotosSelectionController  *photos_selection_controller_dup_singleton      (void);
 
 void                        photos_selection_controller_freeze_selection   (PhotosSelectionController *self,
                                                                             gboolean                   
freeze);
diff --git a/src/photos-selection-toolbar.c b/src/photos-selection-toolbar.c
index e782bc3..311ccf5 100644
--- a/src/photos-selection-toolbar.c
+++ b/src/photos-selection-toolbar.c
@@ -475,9 +475,9 @@ photos_selection_toolbar_init (PhotosSelectionToolbar *self)
 
   gtk_widget_show_all (GTK_WIDGET (self));
 
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
 
-  priv->sel_cntrlr = photos_selection_controller_new ();
+  priv->sel_cntrlr = photos_selection_controller_dup_singleton ();
   g_signal_connect (priv->sel_cntrlr,
                     "selection-changed",
                     G_CALLBACK (photos_selection_toolbar_selection_changed),
diff --git a/src/photos-set-collection-job.c b/src/photos-set-collection-job.c
index d2043f6..609bd7d 100644
--- a/src/photos-set-collection-job.c
+++ b/src/photos-set-collection-job.c
@@ -163,8 +163,8 @@ photos_set_collection_job_init (PhotosSetCollectionJob *self)
   self->priv = photos_set_collection_job_get_instance_private (self);
   priv = self->priv;
 
-  priv->sel_cntrlr = photos_selection_controller_new ();
-  priv->queue = photos_tracker_queue_new ();
+  priv->sel_cntrlr = photos_selection_controller_dup_singleton ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-single-item-job.c b/src/photos-single-item-job.c
index a52b168..63041a6 100644
--- a/src/photos-single-item-job.c
+++ b/src/photos-single-item-job.c
@@ -169,7 +169,7 @@ photos_single_item_job_init (PhotosSingleItemJob *self)
   self->priv = photos_single_item_job_get_instance_private (self);
   priv = self->priv;
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-source-manager.c b/src/photos-source-manager.c
index 3136523..64a1a09 100644
--- a/src/photos-source-manager.c
+++ b/src/photos-source-manager.c
@@ -189,7 +189,7 @@ photos_source_manager_class_init (PhotosSourceManagerClass *class)
 
 
 PhotosBaseManager *
-photos_source_manager_new (void)
+photos_source_manager_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_SOURCE_MANAGER, NULL);
 }
diff --git a/src/photos-source-manager.h b/src/photos-source-manager.h
index 706de65..9dbdc1e 100644
--- a/src/photos-source-manager.h
+++ b/src/photos-source-manager.h
@@ -68,7 +68,7 @@ struct _PhotosSourceManagerClass
 
 GType                     photos_source_manager_get_type           (void) G_GNUC_CONST;
 
-PhotosBaseManager        *photos_source_manager_new                (void);
+PhotosBaseManager        *photos_source_manager_dup_singleton      (void);
 
 GList                    *photos_source_manager_get_for_provider_type (PhotosSourceManager *self,
                                                                        const gchar *provider_type);
diff --git a/src/photos-tracker-change-monitor.c b/src/photos-tracker-change-monitor.c
index 99c3f3e..e9f1fd0 100644
--- a/src/photos-tracker-change-monitor.c
+++ b/src/photos-tracker-change-monitor.c
@@ -303,7 +303,7 @@ photos_tracker_change_monitor_init (PhotosTrackerChangeMonitor *self)
                                          g_free,
                                          (GDestroyNotify) photos_tracker_change_event_free);
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
   priv->resource_service = tracker_resources_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                                      G_DBUS_PROXY_FLAGS_NONE,
                                                                      "org.freedesktop.Tracker1",
@@ -339,7 +339,7 @@ photos_tracker_change_monitor_class_init (PhotosTrackerChangeMonitorClass *class
 
 
 PhotosTrackerChangeMonitor *
-photos_tracker_change_monitor_new (void)
+photos_tracker_change_monitor_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_TRACKER_CHANGE_MONITOR, NULL);
 }
diff --git a/src/photos-tracker-change-monitor.h b/src/photos-tracker-change-monitor.h
index e65c77c..032f0ce 100644
--- a/src/photos-tracker-change-monitor.h
+++ b/src/photos-tracker-change-monitor.h
@@ -72,7 +72,7 @@ struct _PhotosTrackerChangeMonitorClass
 
 GType                        photos_tracker_change_monitor_get_type         (void) G_GNUC_CONST;
 
-PhotosTrackerChangeMonitor  *photos_tracker_change_monitor_new              (void);
+PhotosTrackerChangeMonitor  *photos_tracker_change_monitor_dup_singleton    (void);
 
 G_END_DECLS
 
diff --git a/src/photos-tracker-collections-controller.c b/src/photos-tracker-collections-controller.c
index e0adb06..52c9d9e 100644
--- a/src/photos-tracker-collections-controller.c
+++ b/src/photos-tracker-collections-controller.c
@@ -41,7 +41,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (PhotosTrackerCollectionsController,
 static PhotosOffsetController *
 photos_tracker_collections_controller_get_offset_controller (void)
 {
-  return photos_offset_collections_controller_new ();
+  return photos_offset_collections_controller_dup_singleton ();
 }
 
 
@@ -101,7 +101,7 @@ photos_tracker_collections_controller_init (PhotosTrackerCollectionsController *
   self->priv = photos_tracker_collections_controller_get_instance_private (self);
   priv = self->priv;
 
-  priv->col_mngr = photos_collection_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
 }
 
 
@@ -119,7 +119,7 @@ photos_tracker_collections_controller_class_init (PhotosTrackerCollectionsContro
 
 
 PhotosTrackerController *
-photos_tracker_collections_controller_new (void)
+photos_tracker_collections_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_TRACKER_COLLECTIONS_CONTROLLER, NULL);
 }
diff --git a/src/photos-tracker-collections-controller.h b/src/photos-tracker-collections-controller.h
index 4e437a7..d2c1abe 100644
--- a/src/photos-tracker-collections-controller.h
+++ b/src/photos-tracker-collections-controller.h
@@ -64,7 +64,7 @@ struct _PhotosTrackerCollectionsControllerClass
 
 GType                     photos_tracker_collections_controller_get_type          (void) G_GNUC_CONST;
 
-PhotosTrackerController  *photos_tracker_collections_controller_new               (void);
+PhotosTrackerController  *photos_tracker_collections_controller_dup_singleton     (void);
 
 G_END_DECLS
 
diff --git a/src/photos-tracker-controller.c b/src/photos-tracker-controller.c
index e94d76b..693e5cb 100644
--- a/src/photos-tracker-controller.c
+++ b/src/photos-tracker-controller.c
@@ -311,15 +311,15 @@ photos_tracker_controller_init (PhotosTrackerController *self)
   priv = self->priv;
 
   priv->cancellable = g_cancellable_new ();
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
 
-  priv->col_mngr = photos_collection_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
   g_signal_connect (priv->col_mngr,
                     "active-changed",
                     G_CALLBACK (photos_tracker_controller_refresh_for_object),
                     self);
 
-  priv->src_mngr = photos_source_manager_new ();
+  priv->src_mngr = photos_source_manager_dup_singleton ();
   g_signal_connect (priv->src_mngr,
                     "object-added",
                     G_CALLBACK (photos_tracker_controller_source_object_added),
@@ -333,7 +333,7 @@ photos_tracker_controller_init (PhotosTrackerController *self)
                     G_CALLBACK (photos_tracker_controller_refresh_for_object),
                     self);
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-tracker-favorites-controller.c b/src/photos-tracker-favorites-controller.c
index c6c0d79..905ba7a 100644
--- a/src/photos-tracker-favorites-controller.c
+++ b/src/photos-tracker-favorites-controller.c
@@ -41,7 +41,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (PhotosTrackerFavoritesController,
 static PhotosOffsetController *
 photos_tracker_favorites_controller_get_offset_controller (void)
 {
-  return photos_offset_favorites_controller_new ();
+  return photos_offset_favorites_controller_dup_singleton ();
 }
 
 
@@ -101,7 +101,7 @@ photos_tracker_favorites_controller_init (PhotosTrackerFavoritesController *self
   self->priv = photos_tracker_favorites_controller_get_instance_private (self);
   priv = self->priv;
 
-  priv->col_mngr = photos_collection_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
 }
 
 
@@ -119,7 +119,7 @@ photos_tracker_favorites_controller_class_init (PhotosTrackerFavoritesController
 
 
 PhotosTrackerController *
-photos_tracker_favorites_controller_new (void)
+photos_tracker_favorites_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_TRACKER_FAVORITES_CONTROLLER, NULL);
 }
diff --git a/src/photos-tracker-favorites-controller.h b/src/photos-tracker-favorites-controller.h
index 72b69f1..6d3437c 100644
--- a/src/photos-tracker-favorites-controller.h
+++ b/src/photos-tracker-favorites-controller.h
@@ -64,7 +64,7 @@ struct _PhotosTrackerFavoritesControllerClass
 
 GType                     photos_tracker_favorites_controller_get_type          (void) G_GNUC_CONST;
 
-PhotosTrackerController  *photos_tracker_favorites_controller_new               (void);
+PhotosTrackerController  *photos_tracker_favorites_controller_dup_singleton     (void);
 
 G_END_DECLS
 
diff --git a/src/photos-tracker-overview-controller.c b/src/photos-tracker-overview-controller.c
index e381f5b..fe8a19a 100644
--- a/src/photos-tracker-overview-controller.c
+++ b/src/photos-tracker-overview-controller.c
@@ -36,7 +36,7 @@ G_DEFINE_TYPE (PhotosTrackerOverviewController, photos_tracker_overview_controll
 static PhotosOffsetController *
 photos_tracker_overview_controller_get_offset_controller (void)
 {
-  return photos_offset_overview_controller_new ();
+  return photos_offset_overview_controller_dup_singleton ();
 }
 
 
@@ -86,7 +86,7 @@ photos_tracker_overview_controller_class_init (PhotosTrackerOverviewControllerCl
 
 
 PhotosTrackerController *
-photos_tracker_overview_controller_new (void)
+photos_tracker_overview_controller_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_TRACKER_OVERVIEW_CONTROLLER, NULL);
 }
diff --git a/src/photos-tracker-overview-controller.h b/src/photos-tracker-overview-controller.h
index 3bcf201..984b7c3 100644
--- a/src/photos-tracker-overview-controller.h
+++ b/src/photos-tracker-overview-controller.h
@@ -66,7 +66,7 @@ struct _PhotosTrackerOverviewControllerClass
 
 GType                     photos_tracker_overview_controller_get_type          (void) G_GNUC_CONST;
 
-PhotosTrackerController  *photos_tracker_overview_controller_new               (void);
+PhotosTrackerController  *photos_tracker_overview_controller_dup_singleton     (void);
 
 G_END_DECLS
 
diff --git a/src/photos-tracker-queue.c b/src/photos-tracker-queue.c
index 709ebbc..79eff15 100644
--- a/src/photos-tracker-queue.c
+++ b/src/photos-tracker-queue.c
@@ -239,7 +239,7 @@ photos_tracker_queue_class_init (PhotosTrackerQueueClass *class)
 
 
 PhotosTrackerQueue *
-photos_tracker_queue_new (void)
+photos_tracker_queue_dup_singleton (void)
 {
   return g_object_new (PHOTOS_TYPE_TRACKER_QUEUE, NULL);
 }
diff --git a/src/photos-tracker-queue.h b/src/photos-tracker-queue.h
index 3075963..6563c4d 100644
--- a/src/photos-tracker-queue.h
+++ b/src/photos-tracker-queue.h
@@ -68,7 +68,7 @@ struct _PhotosTrackerQueueClass
 
 GType                  photos_tracker_queue_get_type               (void) G_GNUC_CONST;
 
-PhotosTrackerQueue    *photos_tracker_queue_new                    (void);
+PhotosTrackerQueue    *photos_tracker_queue_dup_singleton          (void);
 
 void                   photos_tracker_queue_select                 (PhotosTrackerQueue *self,
                                                                     const gchar *sparql,
diff --git a/src/photos-update-mtime-job.c b/src/photos-update-mtime-job.c
index 029a932..85a2c14 100644
--- a/src/photos-update-mtime-job.c
+++ b/src/photos-update-mtime-job.c
@@ -124,7 +124,7 @@ photos_update_mtime_job_init (PhotosUpdateMtimeJob *self)
   self->priv = photos_update_mtime_job_get_instance_private (self);
   priv = self->priv;
 
-  priv->queue = photos_tracker_queue_new ();
+  priv->queue = photos_tracker_queue_dup_singleton ();
 }
 
 
diff --git a/src/photos-utils.c b/src/photos-utils.c
index 21929b1..209f2a5 100644
--- a/src/photos-utils.c
+++ b/src/photos-utils.c
@@ -657,7 +657,7 @@ photos_utils_set_edited_name (const gchar *urn, const gchar *title)
   gchar *sparql;
 
   sparql = g_strdup_printf ("INSERT OR REPLACE { <%s> nie:title \"%s\" }", urn, title);
-  queue = photos_tracker_queue_new ();
+  queue = photos_tracker_queue_dup_singleton ();
   photos_tracker_queue_update (queue, sparql, NULL, photos_utils_update_executed, g_strdup (urn), g_free);
   g_object_unref (queue);
   g_free (sparql);
@@ -674,7 +674,7 @@ photos_utils_set_favorite (const gchar *urn, gboolean is_favorite)
                             (is_favorite) ? "INSERT OR REPLACE" : "DELETE",
                             urn);
 
-  queue = photos_tracker_queue_new ();
+  queue = photos_tracker_queue_dup_singleton ();
   photos_tracker_queue_update (queue, sparql, NULL, photos_utils_update_executed, g_strdup (urn), g_free);
   g_object_unref (queue);
 }
diff --git a/src/photos-view-container.c b/src/photos-view-container.c
index 859e43f..c398c91 100644
--- a/src/photos-view-container.c
+++ b/src/photos-view-container.c
@@ -272,9 +272,9 @@ photos_view_container_constructed (GObject *object)
                     G_CALLBACK (photos_view_container_view_selection_changed),
                     self);
 
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
 
-  priv->sel_cntrlr = photos_selection_controller_new ();
+  priv->sel_cntrlr = photos_selection_controller_dup_singleton ();
   g_signal_connect (priv->sel_cntrlr,
                     "selection-mode-changed",
                     G_CALLBACK (photos_view_container_selection_mode_changed),
@@ -283,7 +283,7 @@ photos_view_container_constructed (GObject *object)
                                                 photos_selection_controller_get_selection_mode 
(priv->sel_cntrlr),
                                                 self);
 
-  priv->mode_cntrlr = photos_mode_controller_new ();
+  priv->mode_cntrlr = photos_mode_controller_dup_singleton ();
   g_signal_connect (priv->mode_cntrlr,
                     "window-mode-changed",
                     G_CALLBACK (photos_view_container_window_mode_changed),
@@ -294,15 +294,15 @@ photos_view_container_constructed (GObject *object)
   switch (priv->mode)
     {
     case PHOTOS_WINDOW_MODE_COLLECTIONS:
-      priv->trk_cntrlr = photos_tracker_collections_controller_new ();
+      priv->trk_cntrlr = photos_tracker_collections_controller_dup_singleton ();
       break;
 
     case PHOTOS_WINDOW_MODE_FAVORITES:
-      priv->trk_cntrlr = photos_tracker_favorites_controller_new ();
+      priv->trk_cntrlr = photos_tracker_favorites_controller_dup_singleton ();
       break;
 
     case PHOTOS_WINDOW_MODE_OVERVIEW:
-      priv->trk_cntrlr = photos_tracker_overview_controller_new ();
+      priv->trk_cntrlr = photos_tracker_overview_controller_dup_singleton ();
       break;
 
     default:
diff --git a/src/photos-view-model.c b/src/photos-view-model.c
index ddf75da..f1e3999 100644
--- a/src/photos-view-model.c
+++ b/src/photos-view-model.c
@@ -252,9 +252,9 @@ photos_view_model_init (PhotosViewModel *self)
   gtk_list_store_set_column_types (GTK_LIST_STORE (self), sizeof (columns) / sizeof (columns[0]), columns);
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (self), PHOTOS_VIEW_MODEL_MTIME, 
GTK_SORT_DESCENDING);
 
-  priv->col_mngr = photos_collection_manager_new ();
+  priv->col_mngr = photos_collection_manager_dup_singleton ();
 
-  priv->item_mngr = photos_item_manager_new ();
+  priv->item_mngr = photos_item_manager_dup_singleton ();
   g_signal_connect_swapped (priv->item_mngr, "object-added", G_CALLBACK (photos_view_model_object_added), 
self);
   g_signal_connect_swapped (priv->item_mngr, "object-removed", G_CALLBACK 
(photos_view_model_object_removed), self);
   g_signal_connect_swapped (priv->item_mngr, "clear", G_CALLBACK (gtk_list_store_clear), self);


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