[gnome-photos] tracker-favorites-controller: Simplify code
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] tracker-favorites-controller: Simplify code
- Date: Thu, 27 Jul 2017 13:31:02 +0000 (UTC)
commit 8773559209549250ab0a15aec7fd99ea8080d963
Author: Debarshi Ray <debarshir gnome org>
Date: Thu Jul 27 15:09:59 2017 +0200
tracker-favorites-controller: Simplify code
This was a relic from the times when collections could be marked as
favourites.
src/photos-tracker-favorites-controller.c | 61 +----------------------------
1 files changed, 1 insertions(+), 60 deletions(-)
---
diff --git a/src/photos-tracker-favorites-controller.c b/src/photos-tracker-favorites-controller.c
index 041148c..d898e55 100644
--- a/src/photos-tracker-favorites-controller.c
+++ b/src/photos-tracker-favorites-controller.c
@@ -34,8 +34,6 @@
struct _PhotosTrackerFavoritesController
{
PhotosTrackerController parent_instance;
- PhotosBaseManager *item_mngr;
- PhotosModeController *mode_cntrlr;
PhotosOffsetController *offset_cntrlr;
};
@@ -55,21 +53,6 @@ G_DEFINE_TYPE_WITH_CODE (PhotosTrackerFavoritesController,
0));
-static void
-photos_tracker_favorites_controller_col_active_changed (PhotosTrackerFavoritesController *self)
-{
- PhotosWindowMode mode;
-
- g_return_if_fail (self->mode_cntrlr != NULL);
-
- mode = photos_mode_controller_get_window_mode (self->mode_cntrlr);
- if (mode != PHOTOS_WINDOW_MODE_FAVORITES)
- return;
-
- photos_tracker_controller_refresh_for_object (PHOTOS_TRACKER_CONTROLLER (self));
-}
-
-
static PhotosOffsetController *
photos_tracker_favorites_controller_get_offset_controller (PhotosTrackerController *trk_cntrlr)
{
@@ -83,22 +66,12 @@ photos_tracker_favorites_controller_get_query (PhotosTrackerController *trk_cntr
{
PhotosTrackerFavoritesController *self = PHOTOS_TRACKER_FAVORITES_CONTROLLER (trk_cntrlr);
GApplication *app;
- PhotosBaseItem *collection;
PhotosSearchContextState *state;
- gint flags;
-
- g_return_val_if_fail (self->item_mngr != NULL, NULL);
-
- collection = photos_item_manager_get_active_collection (PHOTOS_ITEM_MANAGER (self->item_mngr));
- if (collection != NULL)
- flags = PHOTOS_QUERY_FLAGS_NONE;
- else
- flags = PHOTOS_QUERY_FLAGS_FAVORITES;
app = g_application_get_default ();
state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
- return photos_query_builder_global_query (state, flags, self->offset_cntrlr);
+ return photos_query_builder_global_query (state, PHOTOS_QUERY_FLAGS_FAVORITES, self->offset_cntrlr);
}
@@ -134,39 +107,8 @@ photos_tracker_favorites_controller_dispose (GObject *object)
static void
-photos_tracker_favorites_controller_finalize (GObject *object)
-{
- PhotosTrackerFavoritesController *self = PHOTOS_TRACKER_FAVORITES_CONTROLLER (object);
-
- if (self->item_mngr != NULL)
- g_object_remove_weak_pointer (G_OBJECT (self->item_mngr), (gpointer *) &self->item_mngr);
-
- if (self->mode_cntrlr != NULL)
- g_object_remove_weak_pointer (G_OBJECT (self->mode_cntrlr), (gpointer *) &self->mode_cntrlr);
-
- G_OBJECT_CLASS (photos_tracker_favorites_controller_parent_class)->finalize (object);
-}
-
-
-static void
photos_tracker_favorites_controller_init (PhotosTrackerFavoritesController *self)
{
- GApplication *app;
- PhotosSearchContextState *state;
-
- app = g_application_get_default ();
- state = photos_search_context_get_state (PHOTOS_SEARCH_CONTEXT (app));
-
- self->item_mngr = state->item_mngr;
- g_object_add_weak_pointer (G_OBJECT (self->item_mngr), (gpointer *) &self->item_mngr);
- g_signal_connect_swapped (self->item_mngr,
- "active-collection-changed",
- G_CALLBACK (photos_tracker_favorites_controller_col_active_changed),
- self);
-
- self->mode_cntrlr = state->mode_cntrlr;
- g_object_add_weak_pointer (G_OBJECT (self->mode_cntrlr), (gpointer *) &self->mode_cntrlr);
-
self->offset_cntrlr = photos_offset_favorites_controller_dup_singleton ();
}
@@ -179,7 +121,6 @@ photos_tracker_favorites_controller_class_init (PhotosTrackerFavoritesController
object_class->constructor = photos_tracker_favorites_controller_constructor;
object_class->dispose = photos_tracker_favorites_controller_dispose;
- object_class->finalize = photos_tracker_favorites_controller_finalize;
tracker_controller_class->get_offset_controller =
photos_tracker_favorites_controller_get_offset_controller;
tracker_controller_class->get_query = photos_tracker_favorites_controller_get_query;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]