Update upstream source from tag 'upstream/0.28.3'

Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7

1 files changed, 371 insertions, 257 deletions

diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 57c205f..e7eda88 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -1,4 +1,4 @@
-/* SavedSearchPage.c generated by valac 0.36.6, the Vala compiler
+/* SavedSearchPage.c generated by valac 0.40.4, the Vala compiler
  * generated from SavedSearchPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
  */
 /* Source monitoring for saved searches.*/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -265,6 +266,11 @@ typedef struct _MediaPagePrivate MediaPagePrivate;
 #define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
 typedef struct _CollectionPagePrivate CollectionPagePrivate;
 typedef struct _SavedSearchPagePrivate SavedSearchPagePrivate;
+enum  {
+	SAVED_SEARCH_PAGE_0_PROPERTY,
+	SAVED_SEARCH_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* saved_search_page_properties[SAVED_SEARCH_PAGE_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
@@ -661,9 +667,15 @@ static gpointer saved_search_page_parent_class = NULL;
 
 gpointer view_manager_ref (gpointer instance);
 void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void value_set_view_manager (GValue* value,
+                             gpointer v_object);
+void value_take_view_manager (GValue* value,
+                              gpointer v_object);
 gpointer value_get_view_manager (const GValue* value);
 GType view_manager_get_type (void) G_GNUC_CONST;
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -673,30 +685,39 @@ GType collection_view_manager_get_type (void) G_GNUC_CONST;
 GType saved_search_manager_get_type (void) G_GNUC_CONST;
 GType saved_search_get_type (void) G_GNUC_CONST;
 #define SAVED_SEARCH_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_MANAGER, SavedSearchManagerPrivate))
-enum  {
-	SAVED_SEARCH_MANAGER_DUMMY_PROPERTY
-};
 GType page_get_type (void) G_GNUC_CONST;
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType media_page_get_type (void) G_GNUC_CONST;
 GType collection_page_get_type (void) G_GNUC_CONST;
 GType saved_search_page_get_type (void) G_GNUC_CONST;
-SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearch* search);
-SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSearchPage* owner, SavedSearch* search);
+SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner,
+                                              SavedSearch* search);
+SavedSearchManager* saved_search_manager_construct (GType object_type,
+                                                    SavedSearchPage* owner,
+                                                    SavedSearch* search);
 CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
-static gboolean saved_search_manager_real_include_in_view (ViewManager* base, DataSource* source);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+                                                          CollectionPage* page);
+static gboolean saved_search_manager_real_include_in_view (ViewManager* base,
+                                                    DataSource* source);
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
-gboolean saved_search_predicate (SavedSearch* self, MediaSource* source);
+gboolean saved_search_predicate (SavedSearch* self,
+                                 MediaSource* source);
 static void saved_search_manager_finalize (ViewManager * obj);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
 void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_injection_group (GValue* value,
+                                gpointer v_object);
+void value_take_injection_group (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_injection_group (const GValue* value);
 GType injection_group_get_type (void) G_GNUC_CONST;
 GType thumbnail_view_get_type (void) G_GNUC_CONST;
@@ -707,41 +728,64 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self);
 gpointer view_filter_ref (gpointer instance);
 void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_view_filter (GValue* value,
+                            gpointer v_object);
+void value_take_view_filter (GValue* value,
+                             gpointer v_object);
 gpointer value_get_view_filter (const GValue* value);
 GType view_filter_get_type (void) G_GNUC_CONST;
 GType search_view_filter_get_type (void) G_GNUC_CONST;
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
-GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+                             gpointer v_object);
+void core_value_take_tracker (GValue* value,
+                              gpointer v_object);
 gpointer core_value_get_tracker (const GValue* value);
 GType core_tracker_get_type (void) G_GNUC_CONST;
 GType core_view_tracker_get_type (void) G_GNUC_CONST;
 GType rating_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
 #define SAVED_SEARCH_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_PAGE, SavedSearchPagePrivate))
-enum  {
-	SAVED_SEARCH_PAGE_DUMMY_PROPERTY
-};
 static void saved_search_page_on_rename_search (SavedSearchPage* self);
-static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self);
 static void saved_search_page_on_edit_search (SavedSearchPage* self);
-static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                         GVariant* parameter,
+                                                                         gpointer self);
 static void saved_search_page_on_delete_search (SavedSearchPage* self);
-static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self);
 SavedSearchPage* saved_search_page_new (SavedSearch* search);
-SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search);
+SavedSearchPage* saved_search_page_construct (GType object_type,
+                                              SavedSearch* search);
 gchar* data_object_get_name (DataObject* self);
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
+CollectionPage* collection_page_construct (GType object_type,
+                                           const gchar* page_name);
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
@@ -749,9 +793,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 gpointer media_collection_registry_ref (gpointer instance);
 void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+                                          gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+                                           gpointer v_object);
 gpointer value_get_media_collection_registry (const GValue* value);
 GType media_collection_registry_get_type (void) G_GNUC_CONST;
 MediaCollectionRegistry* media_collection_registry_get_instance (void);
@@ -760,111 +810,164 @@ GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 gpointer view_collection_monitor_ref (gpointer instance);
 void view_collection_monitor_unref (gpointer instance);
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void view_collection_value_set_monitor (GValue* value, gpointer v_object);
-void view_collection_value_take_monitor (GValue* value, gpointer v_object);
+GParamSpec* view_collection_param_spec_monitor (const gchar* name,
+                                                const gchar* nick,
+                                                const gchar* blurb,
+                                                GType object_type,
+                                                GParamFlags flags);
+void view_collection_value_set_monitor (GValue* value,
+                                        gpointer v_object);
+void view_collection_value_take_monitor (GValue* value,
+                                         gpointer v_object);
 gpointer view_collection_value_get_monitor (const GValue* value);
 GType view_collection_monitor_get_type (void) G_GNUC_CONST;
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target);
-void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path);
-static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+                                                                  SourceCollection* sources,
+                                                                  ViewManager* manager,
+                                                                  Alteration* prereq,
+                                                                  GeeCollection* initial,
+                                                                  ProgressMonitor progress_monitor,
+                                                                  void* progress_monitor_target);
+void checkerboard_page_init_page_context_menu (CheckerboardPage* self,
+                                               const gchar* path);
+static void saved_search_page_real_get_config_photos_sort (MediaPage* base,
+                                                    gboolean* sort_order,
+                                                    gint* sort_by);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
-void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by);
-static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by);
-void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by);
-static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void saved_search_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void saved_search_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
+void configuration_facade_get_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean* sort_order,
+                                                   gint* sort_by);
+static void saved_search_page_real_set_config_photos_sort (MediaPage* base,
+                                                    gboolean sort_order,
+                                                    gint sort_by);
+void configuration_facade_set_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean sort_order,
+                                                   gint sort_by);
+static void saved_search_page_real_init_collect_ui_filenames (Page* base,
+                                                       GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void saved_search_page_real_add_actions (Page* base,
+                                         GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+static void saved_search_page_real_remove_actions (Page* base,
+                                            GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
 gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_command_manager (GValue* value,
+                                gpointer v_object);
+void value_take_command_manager (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* app_window_get_command_manager (void);
 GType command_get_type (void) G_GNUC_CONST;
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
 DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search);
-DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search);
+DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type,
+                                                                 SavedSearch* search);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
 GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
-void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search);
+void library_window_rename_search_in_sidebar (LibraryWindow* self,
+                                              SavedSearch* search);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search);
-SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search);
+SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type,
+                                                                SavedSearch* saved_search);
 void saved_search_dialog_show (SavedSearchDialog* self);
-static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_update_actions (Page* self, gint selected_count, gint count);
+static void saved_search_page_real_update_actions (Page* base,
+                                            gint selected_count,
+                                            gint count);
+void page_set_action_sensitive (Page* self,
+                                const gchar* name,
+                                gboolean sensitive);
+void page_update_actions (Page* self,
+                          gint selected_count,
+                          gint count);
 static void saved_search_page_finalize (GObject * obj);
 
 static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _saved_search_page_on_rename_search_gsimple_action_activate_callback}, {"EditSearch", _saved_search_page_on_edit_search_gsimple_action_activate_callback}, {"DeleteSearch", _saved_search_page_on_delete_search_gsimple_action_activate_callback}};
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 825 "SavedSearchPage.c"
+#line 926 "SavedSearchPage.c"
 }
 
 
-SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSearchPage* owner, SavedSearch* search) {
+SavedSearchManager*
+saved_search_manager_construct (GType object_type,
+                                SavedSearchPage* owner,
+                                SavedSearch* search)
+{
 	SavedSearchManager* self = NULL;
-	SavedSearchPage* _tmp0_;
-	SavedSearch* _tmp1_;
-	SavedSearch* _tmp2_;
+	SavedSearch* _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_PAGE (owner), NULL);
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp0_ = owner;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	self = (SavedSearchManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = search;
+	self = (SavedSearchManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp0_ = _g_object_ref0 (search);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (self->priv->search);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	self->priv->search = _tmp2_;
+	self->priv->search = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self;
-#line 852 "SavedSearchPage.c"
+#line 951 "SavedSearchPage.c"
 }
 
 
-SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearch* search) {
+SavedSearchManager*
+saved_search_manager_new (SavedSearchPage* owner,
+                          SavedSearch* search)
+{
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return saved_search_manager_construct (TYPE_SAVED_SEARCH_MANAGER, owner, search);
-#line 859 "SavedSearchPage.c"
+#line 961 "SavedSearchPage.c"
 }
 
 
-static gboolean saved_search_manager_real_include_in_view (ViewManager* base, DataSource* source) {
+static gboolean
+saved_search_manager_real_include_in_view (ViewManager* base,
+                                           DataSource* source)
+{
 	SavedSearchManager * self;
 	gboolean result = FALSE;
 	SavedSearch* _tmp0_;
-	DataSource* _tmp1_;
-	gboolean _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager);
 #line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -872,18 +975,16 @@ static gboolean saved_search_manager_real_include_in_view (ViewManager* base, Da
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = self->priv->search;
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = source;
-#line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_ = saved_search_predicate (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	result = _tmp2_;
+	result = saved_search_predicate (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource));
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return result;
-#line 883 "SavedSearchPage.c"
+#line 982 "SavedSearchPage.c"
 }
 
 
-static void saved_search_manager_class_init (SavedSearchManagerClass * klass) {
+static void
+saved_search_manager_class_init (SavedSearchManagerClass * klass)
+{
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_manager_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -892,18 +993,22 @@ static void saved_search_manager_class_init (SavedSearchManagerClass * klass) {
 	g_type_class_add_private (klass, sizeof (SavedSearchManagerPrivate));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) saved_search_manager_real_include_in_view;
-#line 896 "SavedSearchPage.c"
+#line 997 "SavedSearchPage.c"
 }
 
 
-static void saved_search_manager_instance_init (SavedSearchManager * self) {
+static void
+saved_search_manager_instance_init (SavedSearchManager * self)
+{
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self->priv = SAVED_SEARCH_MANAGER_GET_PRIVATE (self);
-#line 903 "SavedSearchPage.c"
+#line 1006 "SavedSearchPage.c"
 }
 
 
-static void saved_search_manager_finalize (ViewManager * obj) {
+static void
+saved_search_manager_finalize (ViewManager * obj)
+{
 	SavedSearchManager * self;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_MANAGER, SavedSearchManager);
@@ -911,11 +1016,13 @@ static void saved_search_manager_finalize (ViewManager * obj) {
 	_g_object_unref0 (self->priv->search);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	VIEW_MANAGER_CLASS (saved_search_manager_parent_class)->finalize (obj);
-#line 915 "SavedSearchPage.c"
+#line 1020 "SavedSearchPage.c"
 }
 
 
-GType saved_search_manager_get_type (void) {
+GType
+saved_search_manager_get_type (void)
+{
 	static volatile gsize saved_search_manager_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_manager_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchManager), 0, (GInstanceInitFunc) saved_search_manager_instance_init, NULL };
@@ -927,159 +1034,168 @@ GType saved_search_manager_get_type (void) {
 }
 
 
-static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_page_on_rename_search ((SavedSearchPage*) self);
-#line 934 "SavedSearchPage.c"
+#line 1045 "SavedSearchPage.c"
 }
 
 
-static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_page_on_edit_search ((SavedSearchPage*) self);
-#line 941 "SavedSearchPage.c"
+#line 1056 "SavedSearchPage.c"
 }
 
 
-static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_page_on_delete_search ((SavedSearchPage*) self);
-#line 948 "SavedSearchPage.c"
+#line 1067 "SavedSearchPage.c"
 }
 
 
-SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search) {
+SavedSearchPage*
+saved_search_page_construct (GType object_type,
+                             SavedSearch* search)
+{
 	SavedSearchPage * self = NULL;
-	SavedSearch* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	SavedSearch* _tmp3_;
-	SavedSearch* _tmp4_;
+	SavedSearch* _tmp2_;
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp0_ = search;
-#line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
+	_tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject));
 #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	self = (SavedSearchPage*) collection_page_construct (object_type, _tmp2_);
+	self = (SavedSearchPage*) collection_page_construct (object_type, _tmp1_);
 #line 27 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_g_free0 (_tmp2_);
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp3_ = search;
+	_g_free0 (_tmp1_);
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
+	_tmp2_ = _g_object_ref0 (search);
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (self->priv->search);
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	self->priv->search = _tmp4_;
-#line 979 "SavedSearchPage.c"
+	self->priv->search = _tmp2_;
+#line 1095 "SavedSearchPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp5_;
-		MediaCollectionRegistry* _tmp6_;
-		GeeCollection* _tmp7_;
-		GeeCollection* _tmp8_;
-		GeeIterator* _tmp9_;
-		GeeIterator* _tmp10_;
+		MediaCollectionRegistry* _tmp3_;
+		MediaCollectionRegistry* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeIterator* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp5_ = media_collection_registry_get_instance ();
+		_tmp3_ = media_collection_registry_get_instance ();
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = _tmp3_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp7_ = media_collection_registry_get_all (_tmp6_);
+		_tmp5_ = media_collection_registry_get_all (_tmp4_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp8_ = _tmp7_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp6_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_media_collection_registry_unref0 (_tmp6_);
+		_media_collection_registry_unref0 (_tmp4_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_sources_it = _tmp10_;
+		_sources_it = _tmp8_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		while (TRUE) {
-#line 1008 "SavedSearchPage.c"
-			GeeIterator* _tmp11_;
-			gboolean _tmp12_;
+#line 1124 "SavedSearchPage.c"
+			GeeIterator* _tmp9_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp13_;
-			gpointer _tmp14_;
-			ViewCollection* _tmp15_;
-			ViewCollection* _tmp16_;
-			MediaSourceCollection* _tmp17_;
-			SavedSearch* _tmp18_;
-			SavedSearchManager* _tmp19_;
-			SavedSearchManager* _tmp20_;
-			ViewCollectionMonitor* _tmp21_;
-			ViewCollectionMonitor* _tmp22_;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			ViewCollection* _tmp12_;
+			ViewCollection* _tmp13_;
+			MediaSourceCollection* _tmp14_;
+			SavedSearchManager* _tmp15_;
+			SavedSearchManager* _tmp16_;
+			ViewCollectionMonitor* _tmp17_;
+			ViewCollectionMonitor* _tmp18_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp11_ = _sources_it;
+			_tmp9_ = _sources_it;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp12_ = gee_iterator_next (_tmp11_);
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			if (!_tmp12_) {
+			if (!gee_iterator_next (_tmp9_)) {
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 				break;
-#line 1030 "SavedSearchPage.c"
+#line 1142 "SavedSearchPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp13_ = _sources_it;
+			_tmp10_ = _sources_it;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp14_ = gee_iterator_get (_tmp13_);
+			_tmp11_ = gee_iterator_get (_tmp10_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			sources = (MediaSourceCollection*) _tmp14_;
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			sources = (MediaSourceCollection*) _tmp11_;
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp16_ = _tmp15_;
+			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp17_ = sources;
+			_tmp13_ = _tmp12_;
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp18_ = search;
+			_tmp14_ = sources;
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp19_ = saved_search_manager_new (self, _tmp18_);
+			_tmp15_ = saved_search_manager_new (self, search);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp20_ = _tmp19_;
+			_tmp16_ = _tmp15_;
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp21_ = view_collection_monitor_source_collection (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
+			_tmp17_ = view_collection_monitor_source_collection (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_tmp22_ = _tmp21_;
+			_tmp18_ = _tmp17_;
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_view_collection_monitor_unref0 (_tmp22_);
+			_view_collection_monitor_unref0 (_tmp18_);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_view_manager_unref0 (_tmp20_);
+			_view_manager_unref0 (_tmp16_);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-			_data_collection_unref0 (_tmp16_);
+			_data_collection_unref0 (_tmp13_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_data_collection_unref0 (sources);
-#line 1062 "SavedSearchPage.c"
+#line 1172 "SavedSearchPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 1066 "SavedSearchPage.c"
+#line 1176 "SavedSearchPage.c"
 	}
 #line 34 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "SearchContextMenu");
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self;
-#line 1072 "SavedSearchPage.c"
+#line 1182 "SavedSearchPage.c"
 }
 
 
-SavedSearchPage* saved_search_page_new (SavedSearch* search) {
+SavedSearchPage*
+saved_search_page_new (SavedSearch* search)
+{
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return saved_search_page_construct (TYPE_SAVED_SEARCH_PAGE, search);
-#line 1079 "SavedSearchPage.c"
+#line 1191 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+saved_search_page_real_get_config_photos_sort (MediaPage* base,
+                                               gboolean* sort_order,
+                                               gint* sort_by)
+{
 	SavedSearchPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -1105,23 +1221,25 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo
 	if (sort_order) {
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1109 "SavedSearchPage.c"
+#line 1225 "SavedSearchPage.c"
 	}
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (sort_by) {
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1115 "SavedSearchPage.c"
+#line 1231 "SavedSearchPage.c"
 	}
 }
 
 
-static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+saved_search_page_real_set_config_photos_sort (MediaPage* base,
+                                               gboolean sort_order,
+                                               gint sort_by)
+{
 	SavedSearchPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1129,69 +1247,59 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = _tmp0_;
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_ = sort_order;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp3_ = sort_by;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
+	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by);
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1140 "SavedSearchPage.c"
+#line 1254 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+saved_search_page_real_init_collect_ui_filenames (Page* base,
+                                                  GeeList* ui_filenames)
+{
 	SavedSearchPage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp0_ = ui_filenames;
-#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	PAGE_CLASS (saved_search_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = ui_filenames;
+	PAGE_CLASS (saved_search_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), ui_filenames);
 #line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "savedsearch.ui");
-#line 1160 "SavedSearchPage.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "savedsearch.ui");
+#line 1271 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+saved_search_page_real_add_actions (Page* base,
+                                    GActionMap* map)
+{
 	SavedSearchPage * self;
-	GActionMap* _tmp0_;
-	GActionMap* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp0_ = map;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	PAGE_CLASS (saved_search_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = map;
+	PAGE_CLASS (saved_search_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map);
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	g_action_map_add_action_entries (_tmp1_, SAVED_SEARCH_PAGE_entries, G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries), self);
-#line 1180 "SavedSearchPage.c"
+	g_action_map_add_action_entries (map, SAVED_SEARCH_PAGE_entries, G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries), self);
+#line 1288 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+saved_search_page_real_remove_actions (Page* base,
+                                       GActionMap* map)
+{
 	SavedSearchPage * self;
-	GActionMap* _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp0_ = map;
-#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	PAGE_CLASS (saved_search_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_);
-#line 1195 "SavedSearchPage.c"
+	PAGE_CLASS (saved_search_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), map);
+#line 1303 "SavedSearchPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1203,69 +1311,67 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries);
 #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries); entry_it = entry_it + 1) {
-#line 1207 "SavedSearchPage.c"
+#line 1315 "SavedSearchPage.c"
 			GActionEntry entry = {0};
 #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			entry = entry_collection[entry_it];
-#line 1211 "SavedSearchPage.c"
+#line 1319 "SavedSearchPage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-				_tmp1_ = map;
+				_tmp0_ = entry;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-				_tmp2_ = entry;
+				_tmp1_ = _tmp0_.name;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-				_tmp3_ = _tmp2_.name;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1224 "SavedSearchPage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 1329 "SavedSearchPage.c"
 			}
 		}
 	}
 }
 
 
-static void saved_search_page_on_delete_search (SavedSearchPage* self) {
+static void
+saved_search_page_on_delete_search (SavedSearchPage* self)
+{
 	SavedSearch* _tmp0_;
-	gboolean _tmp1_;
 #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = self->priv->search;
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	if (_tmp1_) {
-#line 1242 "SavedSearchPage.c"
+	if (dialogs_confirm_delete_saved_search (_tmp0_)) {
+#line 1346 "SavedSearchPage.c"
+		CommandManager* _tmp1_;
 		CommandManager* _tmp2_;
-		CommandManager* _tmp3_;
-		SavedSearch* _tmp4_;
+		SavedSearch* _tmp3_;
+		DeleteSavedSearchCommand* _tmp4_;
 		DeleteSavedSearchCommand* _tmp5_;
-		DeleteSavedSearchCommand* _tmp6_;
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp2_ = app_window_get_command_manager ();
+		_tmp1_ = app_window_get_command_manager ();
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp4_ = self->priv->search;
+		_tmp3_ = self->priv->search;
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp5_ = delete_saved_search_command_new (_tmp4_);
+		_tmp4_ = delete_saved_search_command_new (_tmp3_);
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_COMMAND, Command));
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_g_object_unref0 (_tmp6_);
+		_g_object_unref0 (_tmp5_);
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		_command_manager_unref0 (_tmp3_);
-#line 1264 "SavedSearchPage.c"
+		_command_manager_unref0 (_tmp2_);
+#line 1368 "SavedSearchPage.c"
 	}
 }
 
 
-static void saved_search_page_on_rename_search (SavedSearchPage* self) {
+static void
+saved_search_page_on_rename_search (SavedSearchPage* self)
+{
 	LibraryWindow* _tmp0_;
 	LibraryWindow* _tmp1_;
 	SavedSearch* _tmp2_;
@@ -1281,11 +1387,13 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) {
 	library_window_rename_search_in_sidebar (_tmp1_, _tmp2_);
 #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1285 "SavedSearchPage.c"
+#line 1391 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_on_edit_search (SavedSearchPage* self) {
+static void
+saved_search_page_on_edit_search (SavedSearchPage* self)
+{
 	SavedSearchDialog* ssd = NULL;
 	SavedSearch* _tmp0_;
 	SavedSearchDialog* _tmp1_;
@@ -1303,14 +1411,16 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 	saved_search_dialog_show (ssd);
 #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (ssd);
-#line 1307 "SavedSearchPage.c"
+#line 1415 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+saved_search_page_real_update_actions (Page* base,
+                                       gint selected_count,
+                                       gint count)
+{
 	SavedSearchPage * self;
-	gint _tmp0_;
-	gint _tmp1_;
 #line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1320,16 +1430,14 @@ static void saved_search_page_real_update_actions (Page* base, gint selected_cou
 #line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteSearch", TRUE);
 #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp0_ = selected_count;
-#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = count;
-#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	PAGE_CLASS (saved_search_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 1329 "SavedSearchPage.c"
+	PAGE_CLASS (saved_search_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), selected_count, count);
+#line 1435 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_class_init (SavedSearchPageClass * klass) {
+static void
+saved_search_page_class_init (SavedSearchPageClass * klass)
+{
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_page_parent_class = g_type_class_peek_parent (klass);
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
@@ -1348,18 +1456,22 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) {
 	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) saved_search_page_real_update_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = saved_search_page_finalize;
-#line 1352 "SavedSearchPage.c"
+#line 1460 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_instance_init (SavedSearchPage * self) {
+static void
+saved_search_page_instance_init (SavedSearchPage * self)
+{
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self->priv = SAVED_SEARCH_PAGE_GET_PRIVATE (self);
-#line 1359 "SavedSearchPage.c"
+#line 1469 "SavedSearchPage.c"
 }
 
 
-static void saved_search_page_finalize (GObject * obj) {
+static void
+saved_search_page_finalize (GObject * obj)
+{
 	SavedSearchPage * self;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
@@ -1367,11 +1479,13 @@ static void saved_search_page_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->search);
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	G_OBJECT_CLASS (saved_search_page_parent_class)->finalize (obj);
-#line 1371 "SavedSearchPage.c"
+#line 1483 "SavedSearchPage.c"
 }
 
 
-GType saved_search_page_get_type (void) {
+GType
+saved_search_page_get_type (void)
+{
 	static volatile gsize saved_search_page_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchPage), 0, (GInstanceInitFunc) saved_search_page_instance_init, NULL };