[gnome-photos/wip/facebook] search-type-manager: Clean up

[Álvaro Peña <alvaropg src gnome org>]

commit 99fd4ee23b5a03dbcd7f22862d7ea2e176022e43
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Oct 8 18:58:31 2013 +0200

    search-type-manager: Clean up
    
    + There is no need for a builtin "all" PhotosSearchType. We will always
      have the distinction between albums, photos and favorites.
    + Not all albums are nie:DataObjects. Only nfo:DataContainer is
      mandatory.
    
    Fixes: https://bugzilla.gnome.org/709367

 src/photos-query-builder.c       |    2 +-
 src/photos-search-type-manager.c |   38 +++++---------------------------------
 src/photos-search-type.h         |    1 -
 3 files changed, 6 insertions(+), 35 deletions(-)
---
diff --git a/src/photos-query-builder.c b/src/photos-query-builder.c
index 16958da..99476db 100644
--- a/src/photos-query-builder.c
+++ b/src/photos-query-builder.c
@@ -66,7 +66,7 @@ photos_query_builder_set_search_type (gint flags)
   else if (flags & PHOTOS_QUERY_FLAGS_FAVORITES)
     photos_base_manager_set_active_object_by_id (srch_typ_mngr, PHOTOS_SEARCH_TYPE_STOCK_FAVORITES);
   else
-    photos_base_manager_set_active_object_by_id (srch_typ_mngr, PHOTOS_SEARCH_TYPE_STOCK_ALL);
+    photos_base_manager_set_active_object_by_id (srch_typ_mngr, PHOTOS_SEARCH_TYPE_STOCK_PHOTOS);
 
   g_object_unref (srch_typ_mngr);
 }
diff --git a/src/photos-search-type-manager.c b/src/photos-search-type-manager.c
index 3c38afc..60e730c 100644
--- a/src/photos-search-type-manager.c
+++ b/src/photos-search-type-manager.c
@@ -70,13 +70,9 @@ photos_search_type_manager_init (PhotosSearchTypeManager *self)
                                 PHOTOS_QUERY_COLLECTIONS_IDENTIFIER);
   fav_filter = g_strdup_printf ("(%s || %s)", col_filter, item_filter);
 
-  search_type = photos_search_type_new (PHOTOS_SEARCH_TYPE_STOCK_ALL, _("All"));
-  photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
-  g_object_unref (search_type);
-
   search_type = photos_search_type_new_full (PHOTOS_SEARCH_TYPE_STOCK_COLLECTIONS,
                                              _("Albums"),
-                                             "?urn a nfo:DataContainer ; a nie:DataObject",
+                                             "?urn a nfo:DataContainer",
                                              col_filter);
   photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
   g_object_unref (search_type);
@@ -88,15 +84,14 @@ photos_search_type_manager_init (PhotosSearchTypeManager *self)
   photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
   g_object_unref (search_type);
 
-  /* This is only meant to be used with ALL. */
   search_type = photos_search_type_new_full (PHOTOS_SEARCH_TYPE_STOCK_PHOTOS,
                                              _("Photos"),
-                                             "",
-                                             item_filter);
+                                             "?urn a nmm:Photo",
+                                             "(true)");
   photos_base_manager_add_object (PHOTOS_BASE_MANAGER (self), G_OBJECT (search_type));
   g_object_unref (search_type);
 
-  photos_base_manager_set_active_object_by_id (PHOTOS_BASE_MANAGER (self), PHOTOS_SEARCH_TYPE_STOCK_ALL);
+  photos_base_manager_set_active_object_by_id (PHOTOS_BASE_MANAGER (self), PHOTOS_SEARCH_TYPE_STOCK_PHOTOS);
 
   g_free (col_filter);
   g_free (fav_filter);
@@ -123,30 +118,7 @@ gchar *
 photos_search_type_manager_get_where (PhotosSearchTypeManager *self)
 {
   GObject *search_type;
-  gboolean is_all;
-  const gchar *all_where = "?urn a rdfs:Resource";
-  gchar *id;
-  gchar *ret_val;
 
   search_type = photos_base_manager_get_active_object (PHOTOS_BASE_MANAGER (self));
-  if (search_type == NULL)
-    {
-      ret_val = g_strdup (all_where);
-      goto out;
-    }
-
-  g_object_get (search_type, "id", &id, NULL);
-  is_all = (g_strcmp0 (id, PHOTOS_SEARCH_TYPE_STOCK_ALL) == 0);
-  g_free (id);
-
-  if (is_all)
-    {
-      ret_val = g_strdup (all_where);
-      goto out;
-    }
-
-  ret_val = photos_filterable_get_where (PHOTOS_FILTERABLE (search_type));
-
- out:
-  return ret_val;
+  return photos_filterable_get_where (PHOTOS_FILTERABLE (search_type));
 }
diff --git a/src/photos-search-type.h b/src/photos-search-type.h
index 41756e6..1fadb16 100644
--- a/src/photos-search-type.h
+++ b/src/photos-search-type.h
@@ -51,7 +51,6 @@ G_BEGIN_DECLS
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
    PHOTOS_TYPE_SEARCH_TYPE, PhotosSearchTypeClass))
 
-#define PHOTOS_SEARCH_TYPE_STOCK_ALL    "all"
 #define PHOTOS_SEARCH_TYPE_STOCK_COLLECTIONS "collections"
 #define PHOTOS_SEARCH_TYPE_STOCK_FAVORITES "favorites"
 #define PHOTOS_SEARCH_TYPE_STOCK_PHOTOS "photos"