From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Tue, 1 May 2018 14:34:32 +0200
Subject: New upstream version 0.28.2

---
 src/searches/Branch.c               | 1509 ------------
 src/searches/Branch.vala            |  137 --
 src/searches/SavedSearchDialog.c    | 4434 ++++++++++++++++-------------------
 src/searches/SavedSearchDialog.vala |   84 +-
 src/searches/SavedSearchPage.c      |   79 +-
 src/searches/SearchBoolean.c        |   52 +-
 src/searches/SearchesBranch.c       | 1509 ++++++++++++
 src/searches/SearchesBranch.vala    |  137 ++
 8 files changed, 3779 insertions(+), 4162 deletions(-)
 delete mode 100644 src/searches/Branch.c
 delete mode 100644 src/searches/Branch.vala
 create mode 100644 src/searches/SearchesBranch.c
 create mode 100644 src/searches/SearchesBranch.vala

(limited to 'src/searches')

diff --git a/src/searches/Branch.c b/src/searches/Branch.c
deleted file mode 100644
index a1664ff..0000000
--- a/src/searches/Branch.c
+++ /dev/null
@@ -1,1509 +0,0 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gee.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
-#include <gio/gio.h>
-
-
-#define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ())
-#define SIDEBAR_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_BRANCH, SidebarBranch))
-#define SIDEBAR_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_BRANCH, SidebarBranchClass))
-#define SIDEBAR_IS_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_BRANCH))
-#define SIDEBAR_IS_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_BRANCH))
-#define SIDEBAR_BRANCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_BRANCH, SidebarBranchClass))
-
-typedef struct _SidebarBranch SidebarBranch;
-typedef struct _SidebarBranchClass SidebarBranchClass;
-typedef struct _SidebarBranchPrivate SidebarBranchPrivate;
-
-#define SEARCHES_TYPE_BRANCH (searches_branch_get_type ())
-#define SEARCHES_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCHES_TYPE_BRANCH, SearchesBranch))
-#define SEARCHES_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEARCHES_TYPE_BRANCH, SearchesBranchClass))
-#define SEARCHES_IS_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEARCHES_TYPE_BRANCH))
-#define SEARCHES_IS_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEARCHES_TYPE_BRANCH))
-#define SEARCHES_BRANCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEARCHES_TYPE_BRANCH, SearchesBranchClass))
-
-typedef struct _SearchesBranch SearchesBranch;
-typedef struct _SearchesBranchClass SearchesBranchClass;
-typedef struct _SearchesBranchPrivate SearchesBranchPrivate;
-
-#define TYPE_DATA_OBJECT (data_object_get_type ())
-#define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject))
-#define DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_OBJECT, DataObjectClass))
-#define IS_DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_OBJECT))
-#define IS_DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_OBJECT))
-#define DATA_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_OBJECT, DataObjectClass))
-
-typedef struct _DataObject DataObject;
-typedef struct _DataObjectClass DataObjectClass;
-
-#define TYPE_DATA_SOURCE (data_source_get_type ())
-#define DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_SOURCE, DataSource))
-#define DATA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_SOURCE, DataSourceClass))
-#define IS_DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_SOURCE))
-#define IS_DATA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_SOURCE))
-#define DATA_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_SOURCE, DataSourceClass))
-
-typedef struct _DataSource DataSource;
-typedef struct _DataSourceClass DataSourceClass;
-
-#define TYPE_SAVED_SEARCH (saved_search_get_type ())
-#define SAVED_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH, SavedSearch))
-#define SAVED_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH, SavedSearchClass))
-#define IS_SAVED_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH))
-#define IS_SAVED_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH))
-#define SAVED_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH, SavedSearchClass))
-
-typedef struct _SavedSearch SavedSearch;
-typedef struct _SavedSearchClass SavedSearchClass;
-
-#define SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY (sidebar_simple_page_entry_get_type ())
-#define SIDEBAR_SIMPLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry))
-#define SIDEBAR_SIMPLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntryClass))
-#define SIDEBAR_IS_SIMPLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY))
-#define SIDEBAR_IS_SIMPLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY))
-#define SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntryClass))
-
-typedef struct _SidebarSimplePageEntry SidebarSimplePageEntry;
-typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
-
-#define SEARCHES_TYPE_SIDEBAR_ENTRY (searches_sidebar_entry_get_type ())
-#define SEARCHES_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry))
-#define SEARCHES_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryClass))
-#define SEARCHES_IS_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEARCHES_TYPE_SIDEBAR_ENTRY))
-#define SEARCHES_IS_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEARCHES_TYPE_SIDEBAR_ENTRY))
-#define SEARCHES_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryClass))
-
-typedef struct _SearchesSidebarEntry SearchesSidebarEntry;
-typedef struct _SearchesSidebarEntryClass SearchesSidebarEntryClass;
-
-#define TYPE_SAVED_SEARCH_TABLE (saved_search_table_get_type ())
-#define SAVED_SEARCH_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_TABLE, SavedSearchTable))
-#define SAVED_SEARCH_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH_TABLE, SavedSearchTableClass))
-#define IS_SAVED_SEARCH_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH_TABLE))
-#define IS_SAVED_SEARCH_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH_TABLE))
-#define SAVED_SEARCH_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH_TABLE, SavedSearchTableClass))
-
-typedef struct _SavedSearchTable SavedSearchTable;
-typedef struct _SavedSearchTableClass SavedSearchTableClass;
-#define _saved_search_table_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_table_unref (var), NULL)))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define SIDEBAR_TYPE_GROUPING (sidebar_grouping_get_type ())
-#define SIDEBAR_GROUPING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_GROUPING, SidebarGrouping))
-#define SIDEBAR_GROUPING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_GROUPING, SidebarGroupingClass))
-#define SIDEBAR_IS_GROUPING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_GROUPING))
-#define SIDEBAR_IS_GROUPING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_GROUPING))
-#define SIDEBAR_GROUPING_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_GROUPING, SidebarGroupingClass))
-
-typedef struct _SidebarGrouping SidebarGrouping;
-typedef struct _SidebarGroupingClass SidebarGroupingClass;
-
-#define SIDEBAR_TYPE_HEADER (sidebar_header_get_type ())
-#define SIDEBAR_HEADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_HEADER, SidebarHeader))
-#define SIDEBAR_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_HEADER, SidebarHeaderClass))
-#define SIDEBAR_IS_HEADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_HEADER))
-#define SIDEBAR_IS_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_HEADER))
-#define SIDEBAR_HEADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_HEADER, SidebarHeaderClass))
-
-typedef struct _SidebarHeader SidebarHeader;
-typedef struct _SidebarHeaderClass SidebarHeaderClass;
-
-#define SEARCHES_TYPE_HEADER (searches_header_get_type ())
-#define SEARCHES_HEADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCHES_TYPE_HEADER, SearchesHeader))
-#define SEARCHES_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEARCHES_TYPE_HEADER, SearchesHeaderClass))
-#define SEARCHES_IS_HEADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEARCHES_TYPE_HEADER))
-#define SEARCHES_IS_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEARCHES_TYPE_HEADER))
-#define SEARCHES_HEADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEARCHES_TYPE_HEADER, SearchesHeaderClass))
-
-typedef struct _SearchesHeader SearchesHeader;
-typedef struct _SearchesHeaderClass SearchesHeaderClass;
-
-#define SIDEBAR_TYPE_ENTRY (sidebar_entry_get_type ())
-#define SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_ENTRY, SidebarEntry))
-#define SIDEBAR_IS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_ENTRY))
-#define SIDEBAR_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_ENTRY, SidebarEntryIface))
-
-typedef struct _SidebarEntry SidebarEntry;
-typedef struct _SidebarEntryIface SidebarEntryIface;
-
-#define SIDEBAR_TYPE_TREE (sidebar_tree_get_type ())
-#define SIDEBAR_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_TREE, SidebarTree))
-#define SIDEBAR_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_TREE, SidebarTreeClass))
-#define SIDEBAR_IS_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_TREE))
-#define SIDEBAR_IS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_TREE))
-#define SIDEBAR_TREE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_TREE, SidebarTreeClass))
-
-typedef struct _SidebarTree SidebarTree;
-typedef struct _SidebarTreeClass SidebarTreeClass;
-
-#define SIDEBAR_BRANCH_TYPE_OPTIONS (sidebar_branch_options_get_type ())
-
-#define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ())
-#define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry))
-#define SIDEBAR_IS_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY))
-#define SIDEBAR_EXPANDABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntryIface))
-
-typedef struct _SidebarExpandableEntry SidebarExpandableEntry;
-typedef struct _SidebarExpandableEntryIface SidebarExpandableEntryIface;
-
-#define SIDEBAR_TYPE_RENAMEABLE_ENTRY (sidebar_renameable_entry_get_type ())
-#define SIDEBAR_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry))
-#define SIDEBAR_IS_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY))
-#define SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntryIface))
-
-typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
-typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
-typedef struct _SidebarGroupingPrivate SidebarGroupingPrivate;
-
-#define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ())
-#define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry))
-#define SIDEBAR_IS_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY))
-#define SIDEBAR_EMPHASIZABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntryIface))
-
-typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
-typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
-typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate;
-
-#define SIDEBAR_TYPE_CONTEXTABLE (sidebar_contextable_get_type ())
-#define SIDEBAR_CONTEXTABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_CONTEXTABLE, SidebarContextable))
-#define SIDEBAR_IS_CONTEXTABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_CONTEXTABLE))
-#define SIDEBAR_CONTEXTABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_CONTEXTABLE, SidebarContextableIface))
-
-typedef struct _SidebarContextable SidebarContextable;
-typedef struct _SidebarContextableIface SidebarContextableIface;
-typedef struct _SearchesHeaderPrivate SearchesHeaderPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define TYPE_APPLICATION (application_get_type ())
-#define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application))
-#define APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APPLICATION, ApplicationClass))
-#define IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APPLICATION))
-#define IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APPLICATION))
-#define APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APPLICATION, ApplicationClass))
-
-typedef struct _Application Application;
-typedef struct _ApplicationClass ApplicationClass;
-#define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-
-#define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
-#define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
-#define SIDEBAR_IS_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY))
-#define SIDEBAR_SELECTABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntryIface))
-
-typedef struct _SidebarSelectableEntry SidebarSelectableEntry;
-typedef struct _SidebarSelectableEntryIface SidebarSelectableEntryIface;
-
-#define SIDEBAR_TYPE_PAGE_REPRESENTATIVE (sidebar_page_representative_get_type ())
-#define SIDEBAR_PAGE_REPRESENTATIVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative))
-#define SIDEBAR_IS_PAGE_REPRESENTATIVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_PAGE_REPRESENTATIVE))
-#define SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentativeIface))
-
-typedef struct _SidebarPageRepresentative SidebarPageRepresentative;
-typedef struct _SidebarPageRepresentativeIface SidebarPageRepresentativeIface;
-
-#define TYPE_PAGE (page_get_type ())
-#define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page))
-#define PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE, PageClass))
-#define IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE))
-#define IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE))
-#define PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE, PageClass))
-
-typedef struct _Page Page;
-typedef struct _PageClass PageClass;
-typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
-
-#define SIDEBAR_TYPE_DESTROYABLE_ENTRY (sidebar_destroyable_entry_get_type ())
-#define SIDEBAR_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntry))
-#define SIDEBAR_IS_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY))
-#define SIDEBAR_DESTROYABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntryIface))
-
-typedef struct _SidebarDestroyableEntry SidebarDestroyableEntry;
-typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface;
-typedef struct _SearchesSidebarEntryPrivate SearchesSidebarEntryPrivate;
-
-#define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
-#define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage))
-#define CHECKERBOARD_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CHECKERBOARD_PAGE, CheckerboardPageClass))
-#define IS_CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CHECKERBOARD_PAGE))
-#define IS_CHECKERBOARD_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CHECKERBOARD_PAGE))
-#define CHECKERBOARD_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPageClass))
-
-typedef struct _CheckerboardPage CheckerboardPage;
-typedef struct _CheckerboardPageClass CheckerboardPageClass;
-
-#define TYPE_MEDIA_PAGE (media_page_get_type ())
-#define MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_PAGE, MediaPage))
-#define MEDIA_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_PAGE, MediaPageClass))
-#define IS_MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_PAGE))
-#define IS_MEDIA_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_PAGE))
-#define MEDIA_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_PAGE, MediaPageClass))
-
-typedef struct _MediaPage MediaPage;
-typedef struct _MediaPageClass MediaPageClass;
-
-#define TYPE_COLLECTION_PAGE (collection_page_get_type ())
-#define COLLECTION_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COLLECTION_PAGE, CollectionPage))
-#define COLLECTION_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COLLECTION_PAGE, CollectionPageClass))
-#define IS_COLLECTION_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COLLECTION_PAGE))
-#define IS_COLLECTION_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COLLECTION_PAGE))
-#define COLLECTION_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COLLECTION_PAGE, CollectionPageClass))
-
-typedef struct _CollectionPage CollectionPage;
-typedef struct _CollectionPageClass CollectionPageClass;
-
-#define TYPE_SAVED_SEARCH_PAGE (saved_search_page_get_type ())
-#define SAVED_SEARCH_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_PAGE, SavedSearchPage))
-#define SAVED_SEARCH_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH_PAGE, SavedSearchPageClass))
-#define IS_SAVED_SEARCH_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH_PAGE))
-#define IS_SAVED_SEARCH_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH_PAGE))
-#define SAVED_SEARCH_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH_PAGE, SavedSearchPageClass))
-
-typedef struct _SavedSearchPage SavedSearchPage;
-typedef struct _SavedSearchPageClass SavedSearchPageClass;
-
-#define TYPE_COMMAND_MANAGER (command_manager_get_type ())
-#define COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_MANAGER, CommandManager))
-#define COMMAND_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND_MANAGER, CommandManagerClass))
-#define IS_COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMMAND_MANAGER))
-#define IS_COMMAND_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMMAND_MANAGER))
-#define COMMAND_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COMMAND_MANAGER, CommandManagerClass))
-
-typedef struct _CommandManager CommandManager;
-typedef struct _CommandManagerClass CommandManagerClass;
-
-#define TYPE_COMMAND (command_get_type ())
-#define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command))
-#define COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND, CommandClass))
-#define IS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMMAND))
-#define IS_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMMAND))
-#define COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COMMAND, CommandClass))
-
-typedef struct _Command Command;
-typedef struct _CommandClass CommandClass;
-
-#define TYPE_PAGE_COMMAND (page_command_get_type ())
-#define PAGE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_COMMAND, PageCommand))
-#define PAGE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_COMMAND, PageCommandClass))
-#define IS_PAGE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_COMMAND))
-#define IS_PAGE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_COMMAND))
-#define PAGE_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_COMMAND, PageCommandClass))
-
-typedef struct _PageCommand PageCommand;
-typedef struct _PageCommandClass PageCommandClass;
-
-#define TYPE_SINGLE_DATA_SOURCE_COMMAND (single_data_source_command_get_type ())
-#define SINGLE_DATA_SOURCE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand))
-#define SINGLE_DATA_SOURCE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommandClass))
-#define IS_SINGLE_DATA_SOURCE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SINGLE_DATA_SOURCE_COMMAND))
-#define IS_SINGLE_DATA_SOURCE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SINGLE_DATA_SOURCE_COMMAND))
-#define SINGLE_DATA_SOURCE_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommandClass))
-
-typedef struct _SingleDataSourceCommand SingleDataSourceCommand;
-typedef struct _SingleDataSourceCommandClass SingleDataSourceCommandClass;
-
-#define TYPE_RENAME_SAVED_SEARCH_COMMAND (rename_saved_search_command_get_type ())
-#define RENAME_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand))
-#define RENAME_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommandClass))
-#define IS_RENAME_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RENAME_SAVED_SEARCH_COMMAND))
-#define IS_RENAME_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RENAME_SAVED_SEARCH_COMMAND))
-#define RENAME_SAVED_SEARCH_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommandClass))
-
-typedef struct _RenameSavedSearchCommand RenameSavedSearchCommand;
-typedef struct _RenameSavedSearchCommandClass RenameSavedSearchCommandClass;
-#define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL)))
-
-#define TYPE_DELETE_SAVED_SEARCH_COMMAND (delete_saved_search_command_get_type ())
-#define DELETE_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand))
-#define DELETE_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommandClass))
-#define IS_DELETE_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DELETE_SAVED_SEARCH_COMMAND))
-#define IS_DELETE_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DELETE_SAVED_SEARCH_COMMAND))
-#define DELETE_SAVED_SEARCH_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommandClass))
-
-typedef struct _DeleteSavedSearchCommand DeleteSavedSearchCommand;
-typedef struct _DeleteSavedSearchCommandClass DeleteSavedSearchCommandClass;
-#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
-#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
-#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
-
-struct _SidebarBranch {
-	GObject parent_instance;
-	SidebarBranchPrivate * priv;
-};
-
-struct _SidebarBranchClass {
-	GObjectClass parent_class;
-};
-
-struct _SearchesBranch {
-	SidebarBranch parent_instance;
-	SearchesBranchPrivate * priv;
-};
-
-struct _SearchesBranchClass {
-	SidebarBranchClass parent_class;
-};
-
-struct _SearchesBranchPrivate {
-	GeeHashMap* entry_map;
-};
-
-struct _SidebarEntryIface {
-	GTypeInterface parent_iface;
-	gchar* (*get_sidebar_name) (SidebarEntry* self);
-	gchar* (*get_sidebar_tooltip) (SidebarEntry* self);
-	gchar* (*get_sidebar_icon) (SidebarEntry* self);
-	gchar* (*to_string) (SidebarEntry* self);
-	void (*grafted) (SidebarEntry* self, SidebarTree* tree);
-	void (*pruned) (SidebarEntry* self, SidebarTree* tree);
-};
-
-typedef enum  {
-	SIDEBAR_BRANCH_OPTIONS_NONE = 0,
-	SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY = 1 << 0,
-	SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD = 1 << 1,
-	SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD = 1 << 2,
-	SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING = 1 << 3
-} SidebarBranchOptions;
-
-struct _SidebarExpandableEntryIface {
-	GTypeInterface parent_iface;
-	gboolean (*expand_on_select) (SidebarExpandableEntry* self);
-};
-
-struct _SidebarRenameableEntryIface {
-	GTypeInterface parent_iface;
-	void (*rename) (SidebarRenameableEntry* self, const gchar* new_name);
-	gboolean (*is_user_renameable) (SidebarRenameableEntry* self);
-};
-
-struct _SidebarGrouping {
-	GObject parent_instance;
-	SidebarGroupingPrivate * priv;
-};
-
-struct _SidebarGroupingClass {
-	GObjectClass parent_class;
-};
-
-struct _SidebarEmphasizableEntryIface {
-	GTypeInterface parent_iface;
-	gboolean (*is_emphasized) (SidebarEmphasizableEntry* self);
-};
-
-struct _SidebarHeader {
-	SidebarGrouping parent_instance;
-	SidebarHeaderPrivate * priv;
-};
-
-struct _SidebarHeaderClass {
-	SidebarGroupingClass parent_class;
-};
-
-struct _SidebarContextableIface {
-	GTypeInterface parent_iface;
-	GtkMenu* (*get_sidebar_context_menu) (SidebarContextable* self, GdkEventButton* event);
-};
-
-struct _SearchesHeader {
-	SidebarHeader parent_instance;
-	SearchesHeaderPrivate * priv;
-};
-
-struct _SearchesHeaderClass {
-	SidebarHeaderClass parent_class;
-};
-
-struct _SearchesHeaderPrivate {
-	GtkBuilder* builder;
-	GtkMenu* context_menu;
-};
-
-struct _SidebarSelectableEntryIface {
-	GTypeInterface parent_iface;
-};
-
-struct _SidebarPageRepresentativeIface {
-	GTypeInterface parent_iface;
-	gboolean (*has_page) (SidebarPageRepresentative* self);
-	Page* (*get_page) (SidebarPageRepresentative* self);
-};
-
-struct _SidebarSimplePageEntry {
-	GObject parent_instance;
-	SidebarSimplePageEntryPrivate * priv;
-};
-
-struct _SidebarSimplePageEntryClass {
-	GObjectClass parent_class;
-	gchar* (*get_sidebar_name) (SidebarSimplePageEntry* self);
-	gchar* (*get_sidebar_tooltip) (SidebarSimplePageEntry* self);
-	gchar* (*get_sidebar_icon) (SidebarSimplePageEntry* self);
-	gchar* (*to_string) (SidebarSimplePageEntry* self);
-	Page* (*create_page) (SidebarSimplePageEntry* self);
-};
-
-struct _SidebarDestroyableEntryIface {
-	GTypeInterface parent_iface;
-	void (*destroy_source) (SidebarDestroyableEntry* self);
-};
-
-struct _SearchesSidebarEntry {
-	SidebarSimplePageEntry parent_instance;
-	SearchesSidebarEntryPrivate * priv;
-};
-
-struct _SearchesSidebarEntryClass {
-	SidebarSimplePageEntryClass parent_class;
-};
-
-struct _SearchesSidebarEntryPrivate {
-	SavedSearch* search;
-};
-
-
-static gpointer searches_branch_parent_class = NULL;
-static gpointer searches_header_parent_class = NULL;
-static SidebarContextableIface * searches_header_sidebar_contextable_parent_iface = NULL;
-static gpointer searches_sidebar_entry_parent_class = NULL;
-static gchar* searches_sidebar_entry_single_search_icon;
-static gchar* searches_sidebar_entry_single_search_icon = NULL;
-static SidebarRenameableEntryIface * searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
-static SidebarDestroyableEntryIface * searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
-
-GType sidebar_branch_get_type (void) G_GNUC_CONST;
-GType searches_branch_get_type (void) G_GNUC_CONST;
-GType data_object_get_type (void) G_GNUC_CONST;
-GType data_source_get_type (void) G_GNUC_CONST;
-GType saved_search_get_type (void) G_GNUC_CONST;
-GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
-GType searches_sidebar_entry_get_type (void) G_GNUC_CONST;
-#define SEARCHES_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_BRANCH, SearchesBranchPrivate))
-enum  {
-	SEARCHES_BRANCH_DUMMY_PROPERTY
-};
-gpointer saved_search_table_ref (gpointer instance);
-void saved_search_table_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_table (GValue* value, gpointer v_object);
-void value_take_saved_search_table (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_table (const GValue* value);
-GType saved_search_table_get_type (void) G_GNUC_CONST;
-SavedSearchTable* saved_search_table_get_instance (void);
-static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search);
-static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self);
-static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search);
-static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self);
-SearchesBranch* searches_branch_new (void);
-SearchesBranch* searches_branch_construct (GType object_type);
-SearchesHeader* searches_header_new (void);
-SearchesHeader* searches_header_construct (GType object_type);
-GType sidebar_grouping_get_type (void) G_GNUC_CONST;
-GType sidebar_header_get_type (void) G_GNUC_CONST;
-GType searches_header_get_type (void) G_GNUC_CONST;
-GType sidebar_tree_get_type (void) G_GNUC_CONST;
-GType sidebar_entry_get_type (void) G_GNUC_CONST;
-GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
-static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-GeeCollection* saved_search_table_get_all (SavedSearchTable* self);
-SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search);
-gint saved_search_compare_names (void* a, void* b);
-SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self);
-SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search);
-SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
-SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void searches_branch_finalize (GObject * obj);
-GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
-GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
-GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
-GType sidebar_contextable_get_type (void) G_GNUC_CONST;
-#define SEARCHES_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_HEADER, SearchesHeaderPrivate))
-enum  {
-	SEARCHES_HEADER_DUMMY_PROPERTY
-};
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
-static void searches_header_setup_context_menu (SearchesHeader* self);
-gchar* resources_get_ui (const gchar* filename);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
-gpointer application_ref (gpointer instance);
-void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
-gpointer value_get_application (const GValue* value);
-GType application_get_type (void) G_GNUC_CONST;
-Application* application_get_instance (void);
-void application_panic (Application* self);
-static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
-static void searches_header_finalize (GObject * obj);
-GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
-GType page_get_type (void) G_GNUC_CONST;
-GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
-GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST;
-#define SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryPrivate))
-enum  {
-	SEARCHES_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
-SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
-void searches_sidebar_entry_init (void);
-void searches_sidebar_entry_terminate (void);
-static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
-gchar* data_object_get_name (DataObject* self);
-static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
-static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
-SavedSearchPage* saved_search_page_new (SavedSearch* search);
-SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search);
-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;
-static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base);
-static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name);
-gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name);
-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);
-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);
-RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name);
-RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name);
-GType page_command_get_type (void) G_GNUC_CONST;
-GType single_data_source_command_get_type (void) G_GNUC_CONST;
-GType rename_saved_search_command_get_type (void) G_GNUC_CONST;
-gchar* resources_rename_search_exists_message (const gchar* name);
-static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base);
-gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
-DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search);
-DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search);
-GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
-static void searches_sidebar_entry_finalize (GObject * obj);
-
-
-static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_branch_on_saved_search_added ((SearchesBranch*) self, search);
-#line 612 "Branch.c"
-}
-
-
-static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_branch_on_saved_search_removed ((SearchesBranch*) self, search);
-#line 619 "Branch.c"
-}
-
-
-static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
-	gint result;
-	result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 628 "Branch.c"
-}
-
-
-SearchesBranch* searches_branch_construct (GType object_type) {
-	SearchesBranch * self = NULL;
-	SearchesHeader* _tmp0_;
-	SearchesHeader* _tmp1_;
-	SavedSearchTable* _tmp13_;
-	SavedSearchTable* _tmp14_;
-	SavedSearchTable* _tmp15_;
-	SavedSearchTable* _tmp16_;
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = searches_header_new ();
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL);
-#line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (_tmp1_);
-#line 648 "Branch.c"
-	{
-		GeeIterator* _search_it = NULL;
-		SavedSearchTable* _tmp2_;
-		SavedSearchTable* _tmp3_;
-		GeeCollection* _tmp4_;
-		GeeCollection* _tmp5_;
-		GeeIterator* _tmp6_;
-		GeeIterator* _tmp7_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp2_ = saved_search_table_get_instance ();
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp3_ = _tmp2_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp4_ = saved_search_table_get_all (_tmp3_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp5_ = _tmp4_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp7_ = _tmp6_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (_tmp5_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_saved_search_table_unref0 (_tmp3_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_search_it = _tmp7_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		while (TRUE) {
-#line 677 "Branch.c"
-			GeeIterator* _tmp8_;
-			gboolean _tmp9_;
-			SavedSearch* search = NULL;
-			GeeIterator* _tmp10_;
-			gpointer _tmp11_;
-			SavedSearch* _tmp12_;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp8_ = _search_it;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			if (!_tmp9_) {
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-				break;
-#line 692 "Branch.c"
-			}
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp10_ = _search_it;
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp11_ = gee_iterator_get (_tmp10_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			search = (SavedSearch*) _tmp11_;
-#line 20 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp12_ = search;
-#line 20 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			searches_branch_on_saved_search_added (self, _tmp12_);
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_g_object_unref0 (search);
-#line 706 "Branch.c"
-		}
-#line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (_search_it);
-#line 710 "Branch.c"
-	}
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp13_ = saved_search_table_get_instance ();
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp14_ = _tmp13_;
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_signal_connect_object (_tmp14_, "search-added", (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self, 0);
-#line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_saved_search_table_unref0 (_tmp14_);
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp15_ = saved_search_table_get_instance ();
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp16_ = _tmp15_;
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_signal_connect_object (_tmp16_, "search-removed", (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self, 0);
-#line 24 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_saved_search_table_unref0 (_tmp16_);
-#line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return self;
-#line 730 "Branch.c"
-}
-
-
-SearchesBranch* searches_branch_new (void) {
-#line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return searches_branch_construct (SEARCHES_TYPE_BRANCH);
-#line 737 "Branch.c"
-}
-
-
-SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search) {
-	SearchesSidebarEntry* result = NULL;
-	GeeHashMap* _tmp0_;
-	SavedSearch* _tmp1_;
-	gpointer _tmp2_;
-#line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL);
-#line 32 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = self->priv->entry_map;
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = search;
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = (SearchesSidebarEntry*) _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 760 "Branch.c"
-}
-
-
-static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
-	gint result = 0;
-	SidebarEntry* _tmp0_;
-	SidebarEntry* _tmp1_;
-	SidebarEntry* _tmp2_;
-	SavedSearch* _tmp3_;
-	SidebarEntry* _tmp4_;
-	SavedSearch* _tmp5_;
-	gint _tmp6_;
-#line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 36 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 37 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = a;
-#line 37 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = b;
-#line 37 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	if (_tmp0_ == _tmp1_) {
-#line 38 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		result = 0;
-#line 38 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		return result;
-#line 787 "Branch.c"
-	}
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_ = a;
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp4_ = b;
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp5_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp6_ = saved_search_compare_names (_tmp3_, _tmp5_);
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = _tmp6_;
-#line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 803 "Branch.c"
-}
-
-
-static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search) {
-	SearchesSidebarEntry* entry = NULL;
-	SavedSearch* _tmp0_;
-	SearchesSidebarEntry* _tmp1_;
-	GeeHashMap* _tmp2_;
-	SavedSearch* _tmp3_;
-	SidebarEntry* _tmp4_;
-	SidebarEntry* _tmp5_;
-#line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_if_fail (SEARCHES_IS_BRANCH (self));
-#line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 45 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_debug ("Branch.vala:45: search added");
-#line 46 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = search;
-#line 46 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = searches_sidebar_entry_new (_tmp0_);
-#line 46 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	entry = _tmp1_;
-#line 47 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_ = self->priv->entry_map;
-#line 47 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = search;
-#line 47 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry);
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp5_ = _tmp4_;
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 48 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (_tmp5_);
-#line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (entry);
-#line 843 "Branch.c"
-}
-
-
-static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search) {
-	SearchesSidebarEntry* entry = NULL;
-	GeeHashMap* _tmp0_;
-	SavedSearch* _tmp1_;
-	gpointer _tmp2_;
-	gboolean is_removed = FALSE;
-	GeeHashMap* _tmp3_;
-	SavedSearch* _tmp4_;
-	gboolean _tmp5_;
-#line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_if_fail (SEARCHES_IS_BRANCH (self));
-#line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 52 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_debug ("Branch.vala:52: search removed");
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = self->priv->entry_map;
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = search;
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 53 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	entry = (SearchesSidebarEntry*) _tmp2_;
-#line 54 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_vala_assert (entry != NULL, "entry != null");
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = self->priv->entry_map;
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp4_ = search;
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL);
-#line 56 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	is_removed = _tmp5_;
-#line 57 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_vala_assert (is_removed, "is_removed");
-#line 59 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (entry);
-#line 886 "Branch.c"
-}
-
-
-static void searches_branch_class_init (SearchesBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_type_class_add_private (klass, sizeof (SearchesBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize;
-#line 897 "Branch.c"
-}
-
-
-static void searches_branch_instance_init (SearchesBranch * self) {
-	GeeHashMap* _tmp0_;
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv = SEARCHES_BRANCH_GET_PRIVATE (self);
-#line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->entry_map = _tmp0_;
-#line 909 "Branch.c"
-}
-
-
-static void searches_branch_finalize (GObject * obj) {
-	SearchesBranch * self;
-	SavedSearchTable* _tmp0_;
-	SavedSearchTable* _tmp1_;
-	guint _tmp2_;
-	SavedSearchTable* _tmp3_;
-	SavedSearchTable* _tmp4_;
-	guint _tmp5_;
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_BRANCH, SearchesBranch);
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = saved_search_table_get_instance ();
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = _tmp0_;
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_signal_parse_name ("search-added", TYPE_SAVED_SEARCH_TABLE, &_tmp2_, NULL, FALSE);
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self);
-#line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_saved_search_table_unref0 (_tmp1_);
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = saved_search_table_get_instance ();
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp4_ = _tmp3_;
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_signal_parse_name ("search-removed", TYPE_SAVED_SEARCH_TABLE, &_tmp5_, NULL, FALSE);
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self);
-#line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_saved_search_table_unref0 (_tmp4_);
-#line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->entry_map);
-#line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj);
-#line 947 "Branch.c"
-}
-
-
-GType searches_branch_get_type (void) {
-	static volatile gsize searches_branch_type_id__volatile = 0;
-	if (g_once_init_enter (&searches_branch_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (SearchesBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesBranch), 0, (GInstanceInitFunc) searches_branch_instance_init, NULL };
-		GType searches_branch_type_id;
-		searches_branch_type_id = g_type_register_static (SIDEBAR_TYPE_BRANCH, "SearchesBranch", &g_define_type_info, 0);
-		g_once_init_leave (&searches_branch_type_id__volatile, searches_branch_type_id);
-	}
-	return searches_branch_type_id__volatile;
-}
-
-
-SearchesHeader* searches_header_construct (GType object_type) {
-	SearchesHeader * self = NULL;
-#line 68 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), TRUE);
-#line 69 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_header_setup_context_menu (self);
-#line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return self;
-#line 971 "Branch.c"
-}
-
-
-SearchesHeader* searches_header_new (void) {
-#line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 978 "Branch.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 985 "Branch.c"
-}
-
-
-static void searches_header_setup_context_menu (SearchesHeader* self) {
-	GtkBuilder* _tmp0_;
-	GError * _inner_error_ = NULL;
-#line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_if_fail (SEARCHES_IS_HEADER (self));
-#line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = gtk_builder_new ();
-#line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->builder = _tmp0_;
-#line 1000 "Branch.c"
-	{
-		GtkBuilder* _tmp1_;
-		gchar* _tmp2_;
-		gchar* _tmp3_;
-		GMenuModel* model = NULL;
-		GtkBuilder* _tmp4_;
-		GObject* _tmp5_;
-		GMenuModel* _tmp6_;
-		GMenuModel* _tmp7_;
-		GtkMenu* _tmp8_;
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp1_ = self->priv->builder;
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp2_ = resources_get_ui ("search_sidebar_context.ui");
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp3_ = _tmp2_;
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp3_);
-#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1023 "Branch.c"
-			goto __catch77_g_error;
-		}
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp4_ = self->priv->builder;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp5_) : NULL);
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		model = _tmp6_;
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp7_ = model;
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		g_object_ref_sink (_tmp8_);
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (self->priv->context_menu);
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		self->priv->context_menu = _tmp8_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (model);
-#line 1046 "Branch.c"
-	}
-	goto __finally77;
-	__catch77_g_error:
-	{
-		GError* _error_ = NULL;
-		GError* _tmp9_;
-		const gchar* _tmp10_;
-		gchar* _tmp11_;
-		gchar* _tmp12_;
-		Application* _tmp13_;
-		Application* _tmp14_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_error_ = _inner_error_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_inner_error_ = NULL;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp9_ = _error_;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp10_ = _tmp9_->message;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp12_ = _tmp11_;
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		app_window_error_message (_tmp12_, NULL);
-#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp12_);
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp13_ = application_get_instance ();
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp14_ = _tmp13_;
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		application_panic (_tmp14_);
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_application_unref0 (_tmp14_);
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_error_free0 (_error_);
-#line 1084 "Branch.c"
-	}
-	__finally77:
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		g_clear_error (&_inner_error_);
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		return;
-#line 1095 "Branch.c"
-	}
-}
-
-
-static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
-	SearchesHeader * self;
-	GtkMenu* result = NULL;
-	GtkMenu* _tmp0_;
-	GtkMenu* _tmp1_;
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = self->priv->context_menu;
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = _tmp1_;
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 1115 "Branch.c"
-}
-
-
-static void searches_header_class_init (SearchesHeaderClass * klass) {
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_header_parent_class = g_type_class_peek_parent (klass);
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1126 "Branch.c"
-}
-
-
-static void searches_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) {
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1135 "Branch.c"
-}
-
-
-static void searches_header_instance_init (SearchesHeader * self) {
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
-#line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->context_menu = NULL;
-#line 1144 "Branch.c"
-}
-
-
-static void searches_header_finalize (GObject * obj) {
-	SearchesHeader * self;
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader);
-#line 64 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->context_menu);
-#line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1158 "Branch.c"
-}
-
-
-GType searches_header_get_type (void) {
-	static volatile gsize searches_header_type_id__volatile = 0;
-	if (g_once_init_enter (&searches_header_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (SearchesHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesHeader), 0, (GInstanceInitFunc) searches_header_instance_init, NULL };
-		static const GInterfaceInfo sidebar_contextable_info = { (GInterfaceInitFunc) searches_header_sidebar_contextable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType searches_header_type_id;
-		searches_header_type_id = g_type_register_static (SIDEBAR_TYPE_HEADER, "SearchesHeader", &g_define_type_info, 0);
-		g_type_add_interface_static (searches_header_type_id, SIDEBAR_TYPE_CONTEXTABLE, &sidebar_contextable_info);
-		g_once_init_leave (&searches_header_type_id__volatile, searches_header_type_id);
-	}
-	return searches_header_type_id__volatile;
-}
-
-
-SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search) {
-	SearchesSidebarEntry * self = NULL;
-	SavedSearch* _tmp0_;
-	SavedSearch* _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = search;
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->search);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->search = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return self;
-#line 1194 "Branch.c"
-}
-
-
-SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1201 "Branch.c"
-}
-
-
-void searches_sidebar_entry_init (void) {
-}
-
-
-void searches_sidebar_entry_terminate (void) {
-}
-
-
-SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) {
-	SavedSearch* result = NULL;
-	SavedSearch* _tmp0_;
-	SavedSearch* _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = self->priv->search;
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = _tmp1_;
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 1227 "Branch.c"
-}
-
-
-static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
-	SearchesSidebarEntry * self;
-	gchar* result = NULL;
-	SavedSearch* _tmp0_;
-	gchar* _tmp1_;
-#line 110 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = self->priv->search;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 1246 "Branch.c"
-}
-
-
-static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
-	SearchesSidebarEntry * self;
-	gchar* result = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 114 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = searches_sidebar_entry_single_search_icon;
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = _tmp1_;
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 1265 "Branch.c"
-}
-
-
-static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
-	SearchesSidebarEntry * self;
-	Page* result = NULL;
-	SavedSearch* _tmp0_;
-	SavedSearchPage* _tmp1_;
-#line 118 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = self->priv->search;
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = saved_search_page_new (_tmp0_);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_object_ref_sink (_tmp1_);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 1286 "Branch.c"
-}
-
-
-static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
-	SearchesSidebarEntry * self;
-	gboolean result = FALSE;
-#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	result = TRUE;
-#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	return result;
-#line 1299 "Branch.c"
-}
-
-
-static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
-	SearchesSidebarEntry * self;
-	SavedSearchTable* _tmp0_;
-	SavedSearchTable* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_if_fail (new_name != NULL);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = saved_search_table_get_instance ();
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = _tmp0_;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_ = new_name;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp4_ = !_tmp3_;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_saved_search_table_unref0 (_tmp1_);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	if (_tmp4_) {
-#line 1328 "Branch.c"
-		CommandManager* _tmp5_;
-		CommandManager* _tmp6_;
-		SavedSearch* _tmp7_;
-		const gchar* _tmp8_;
-		RenameSavedSearchCommand* _tmp9_;
-		RenameSavedSearchCommand* _tmp10_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp5_ = app_window_get_command_manager ();
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp6_ = _tmp5_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp7_ = self->priv->search;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp8_ = new_name;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp10_ = _tmp9_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (_tmp10_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_command_manager_unref0 (_tmp6_);
-#line 1353 "Branch.c"
-	} else {
-		const gchar* _tmp11_;
-		SavedSearch* _tmp12_;
-		gchar* _tmp13_;
-		gchar* _tmp14_;
-		gboolean _tmp15_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp11_ = new_name;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp12_ = self->priv->search;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp14_ = _tmp13_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp14_);
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		if (_tmp15_) {
-#line 1374 "Branch.c"
-			const gchar* _tmp16_;
-			gchar* _tmp17_;
-			gchar* _tmp18_;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp16_ = new_name;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_tmp18_ = _tmp17_;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			app_window_error_message (_tmp18_, NULL);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-			_g_free0 (_tmp18_);
-#line 1388 "Branch.c"
-		}
-	}
-}
-
-
-static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) {
-	SearchesSidebarEntry * self;
-	SavedSearch* _tmp0_;
-	gboolean _tmp1_;
-#line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = self->priv->search;
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	if (_tmp1_) {
-#line 1406 "Branch.c"
-		CommandManager* _tmp2_;
-		CommandManager* _tmp3_;
-		SavedSearch* _tmp4_;
-		DeleteSavedSearchCommand* _tmp5_;
-		DeleteSavedSearchCommand* _tmp6_;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp2_ = app_window_get_command_manager ();
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp3_ = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp4_ = self->priv->search;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp5_ = delete_saved_search_command_new (_tmp4_);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp6_ = _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (_tmp6_);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_command_manager_unref0 (_tmp3_);
-#line 1428 "Branch.c"
-	}
-}
-
-
-static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
-	gchar* _tmp0_;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_name;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_icon;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_create_page;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
-#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = g_strdup ("edit-find");
-#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1451 "Branch.c"
-}
-
-
-static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1462 "Branch.c"
-}
-
-
-static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source;
-#line 1471 "Branch.c"
-}
-
-
-static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1478 "Branch.c"
-}
-
-
-static void searches_sidebar_entry_finalize (GObject * obj) {
-	SearchesSidebarEntry * self;
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 94 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->search);
-#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1490 "Branch.c"
-}
-
-
-GType searches_sidebar_entry_get_type (void) {
-	static volatile gsize searches_sidebar_entry_type_id__volatile = 0;
-	if (g_once_init_enter (&searches_sidebar_entry_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (SearchesSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesSidebarEntry), 0, (GInstanceInitFunc) searches_sidebar_entry_instance_init, NULL };
-		static const GInterfaceInfo sidebar_renameable_entry_info = { (GInterfaceInitFunc) searches_sidebar_entry_sidebar_renameable_entry_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		static const GInterfaceInfo sidebar_destroyable_entry_info = { (GInterfaceInitFunc) searches_sidebar_entry_sidebar_destroyable_entry_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType searches_sidebar_entry_type_id;
-		searches_sidebar_entry_type_id = g_type_register_static (SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, "SearchesSidebarEntry", &g_define_type_info, 0);
-		g_type_add_interface_static (searches_sidebar_entry_type_id, SIDEBAR_TYPE_RENAMEABLE_ENTRY, &sidebar_renameable_entry_info);
-		g_type_add_interface_static (searches_sidebar_entry_type_id, SIDEBAR_TYPE_DESTROYABLE_ENTRY, &sidebar_destroyable_entry_info);
-		g_once_init_leave (&searches_sidebar_entry_type_id__volatile, searches_sidebar_entry_type_id);
-	}
-	return searches_sidebar_entry_type_id__volatile;
-}
-
-
-
diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala
deleted file mode 100644
index 3b54acf..0000000
--- a/src/searches/Branch.vala
+++ /dev/null
@@ -1,137 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
-
-public class Searches.Branch : Sidebar.Branch {
-    private Gee.HashMap<SavedSearch, Searches.SidebarEntry> entry_map = 
-        new Gee.HashMap<SavedSearch, Searches.SidebarEntry>();
-    
-    public Branch() {
-        base (new Searches.Header(),
-            Sidebar.Branch.Options.HIDE_IF_EMPTY
-                | Sidebar.Branch.Options.AUTO_OPEN_ON_NEW_CHILD
-                | Sidebar.Branch.Options.STARTUP_EXPAND_TO_FIRST_CHILD,
-            comparator);
-        
-        // seed the branch with existing searches
-        foreach (SavedSearch search in SavedSearchTable.get_instance().get_all())
-            on_saved_search_added(search);
-        
-        // monitor collection for future events
-        SavedSearchTable.get_instance().search_added.connect(on_saved_search_added);
-        SavedSearchTable.get_instance().search_removed.connect(on_saved_search_removed);
-    }
-    
-    ~Branch() {
-        SavedSearchTable.get_instance().search_added.disconnect(on_saved_search_added);
-        SavedSearchTable.get_instance().search_removed.disconnect(on_saved_search_removed);
-    }
-    
-    public Searches.SidebarEntry? get_entry_for_saved_search(SavedSearch search) {
-        return entry_map.get(search);
-    }
-    
-    private static int comparator(Sidebar.Entry a, Sidebar.Entry b) {
-        if (a == b)
-            return 0;
-        
-        return SavedSearch.compare_names(((Searches.SidebarEntry) a).for_saved_search(),
-            ((Searches.SidebarEntry) b).for_saved_search());
-    }
-    
-    private void on_saved_search_added(SavedSearch search) {
-        debug("search added");
-        Searches.SidebarEntry entry = new Searches.SidebarEntry(search);
-        entry_map.set(search, entry);
-        graft(get_root(), entry);
-    }
-    
-    private void on_saved_search_removed(SavedSearch search) {
-        debug("search removed");
-        Searches.SidebarEntry? entry = entry_map.get(search);
-        assert(entry != null);
-        
-        bool is_removed = entry_map.unset(search);
-        assert(is_removed);
-        
-        prune(entry);
-    }
-}
-
-public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
-    private Gtk.Builder builder;
-    private Gtk.Menu? context_menu = null;
-    
-    public Header() {
-        base (_("Saved Searches"));
-        setup_context_menu();
-    }
-
-    private void setup_context_menu() {
-        this.builder = new Gtk.Builder ();
-        try {
-            this.builder.add_from_resource(Resources.get_ui("search_sidebar_context.ui"));
-            var model = builder.get_object ("popup-menu") as GLib.MenuModel;
-            this.context_menu = new Gtk.Menu.from_model (model);
-        } catch (Error error) {
-            AppWindow.error_message("Error loading UI resource: %s".printf(
-                error.message));
-            Application.get_instance().panic();
-        }
-    }
-
-    public Gtk.Menu? get_sidebar_context_menu(Gdk.EventButton? event) {
-        return context_menu;
-    }
-}
-
-public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry,
-    Sidebar.DestroyableEntry {
-    private static string single_search_icon = "edit-find";
-    
-    private SavedSearch search;
-    
-    public SidebarEntry(SavedSearch search) {
-        this.search = search;
-    }
-    
-    internal static void init() {
-    }
-    
-    internal static void terminate() {
-    }
-    
-    public SavedSearch for_saved_search() {
-        return search;
-    }
-    
-    public override string get_sidebar_name() {
-        return search.get_name();
-    }
-    
-    public override string? get_sidebar_icon() {
-        return single_search_icon;
-    }
-    
-    protected override Page create_page() {
-        return new SavedSearchPage(search);
-    }
-    
-    public bool is_user_renameable() {
-        return true;
-    }
-    
-    public void rename(string new_name) {
-        if (!SavedSearchTable.get_instance().exists(new_name))
-            AppWindow.get_command_manager().execute(new RenameSavedSearchCommand(search, new_name));
-        else if (new_name != search.get_name())
-            AppWindow.error_message(Resources.rename_search_exists_message(new_name));
-    }
-    
-    public void destroy_source() {
-        if (Dialogs.confirm_delete_saved_search(search))
-            AppWindow.get_command_manager().execute(new DeleteSavedSearchCommand(search));
-    }
-}
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 86fd417..09e5fec 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -15,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gdk/gdk.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -285,30 +284,25 @@ typedef struct _SavedSearchDialogSearchRowDatePrivate SavedSearchDialogSearchRow
 typedef struct _SearchConditionDate SearchConditionDate;
 typedef struct _SearchConditionDateClass SearchConditionDateClass;
 typedef struct _Block10Data Block10Data;
-typedef struct _ParamSpecSavedSearchDialog ParamSpecSavedSearchDialog;
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
 #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 
 struct _SavedSearchDialog {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
+	GtkDialog parent_instance;
 	SavedSearchDialogPrivate * priv;
 };
 
 struct _SavedSearchDialogClass {
-	GTypeClass parent_class;
-	void (*finalize) (SavedSearchDialog *self);
+	GtkDialogClass parent_class;
 };
 
 struct _SavedSearchDialogPrivate {
-	GtkBuilder* builder;
-	GtkDialog* dialog;
 	GtkButton* add_criteria;
 	GtkComboBoxText* operator;
-	GtkBox* row_box;
 	GtkEntry* search_title;
+	GtkListBox* row_listbox;
 	GeeArrayList* row_list;
 	gboolean edit_mode;
 	SavedSearch* previous_search;
@@ -546,10 +540,6 @@ struct _Block10Data {
 	GtkDialog* d;
 };
 
-struct _ParamSpecSavedSearchDialog {
-	GParamSpec parent_instance;
-};
-
 
 static gpointer saved_search_dialog_parent_class = NULL;
 static gpointer saved_search_dialog_search_row_container_parent_class = NULL;
@@ -561,12 +551,6 @@ static gpointer saved_search_dialog_search_row_flagged_parent_class = NULL;
 static gpointer saved_search_dialog_search_row_rating_parent_class = NULL;
 static gpointer saved_search_dialog_search_row_date_parent_class = NULL;
 
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 static gpointer saved_search_dialog_search_row_container_ref (gpointer instance);
 static void saved_search_dialog_search_row_container_unref (gpointer instance);
@@ -582,10 +566,9 @@ GType saved_search_get_type (void) G_GNUC_CONST;
 enum  {
 	SAVED_SEARCH_DIALOG_DUMMY_PROPERTY
 };
-static void saved_search_dialog_on_title_changed (SavedSearchDialog* self);
-static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
+gint resources_use_header_bar (void);
 static void saved_search_dialog_setup_dialog (SavedSearchDialog* self);
 gpointer saved_search_table_ref (gpointer instance);
 void saved_search_table_unref (gpointer instance);
@@ -615,14 +598,15 @@ GeeList* saved_search_get_conditions (SavedSearch* self);
 static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc);
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id);
 static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, GdkEventButton* event);
-static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self);
+static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void saved_search_dialog_on_title_changed (SavedSearchDialog* self);
+static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 void saved_search_dialog_show (SavedSearchDialog* self);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type);
@@ -661,8 +645,8 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
 static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self);
 static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self, GdkEventButton* event);
-static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self);
+static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self);
 static GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self);
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent);
@@ -818,100 +802,93 @@ static Block10Data* block10_data_ref (Block10Data* _data10_);
 static void block10_data_unref (void * _userdata_);
 #define RESOURCES_CANCEL_LABEL _ ("_Cancel")
 #define RESOURCES_OK_LABEL _ ("_OK")
-static void __lambda13_ (SavedSearchDialogSearchRowDate* self);
-static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
-static void __lambda14_ (Block10Data* _data10_);
-static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
+static void __lambda14_ (SavedSearchDialogSearchRowDate* self);
+static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
+static void __lambda15_ (Block10Data* _data10_);
+static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
 static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj);
-static void saved_search_dialog_finalize (SavedSearchDialog * obj);
-
-
-static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_on_title_changed ((SavedSearchDialog*) self);
-#line 833 "SavedSearchDialog.c"
-}
+static void saved_search_dialog_finalize (GObject * obj);
 
 
 SavedSearchDialog* saved_search_dialog_construct (GType object_type) {
-	SavedSearchDialog* self = NULL;
-	GtkEntry* _tmp0_;
-	SavedSearchTable* _tmp1_;
+	SavedSearchDialog * self = NULL;
+	gint _tmp0_;
+	GtkEntry* _tmp1_;
 	SavedSearchTable* _tmp2_;
-	gchar* _tmp3_;
+	SavedSearchTable* _tmp3_;
 	gchar* _tmp4_;
-	GtkEntry* _tmp5_;
-	GeeArrayList* _tmp6_;
-	gpointer _tmp7_;
-	SavedSearchDialogSearchRowContainer* _tmp8_;
-	GtkDialog* _tmp9_;
-#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialog*) g_type_create_instance (object_type);
-#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_setup_dialog (self);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = self->priv->search_title;
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_table_get_instance ();
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = _tmp1_;
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = saved_search_table_generate_unique_name (_tmp2_);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_text (_tmp0_, _tmp4_);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_free0 (_tmp4_);
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_saved_search_table_unref0 (_tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->search_title;
-#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1);
-#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_add_text_search (self);
-#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->row_list;
-#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = (SavedSearchDialogSearchRowContainer*) _tmp7_;
+	gchar* _tmp5_;
+	GtkEntry* _tmp6_;
+	GeeArrayList* _tmp7_;
+	gpointer _tmp8_;
+	SavedSearchDialogSearchRowContainer* _tmp9_;
 #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_allow_removal (_tmp8_, FALSE);
+	_tmp0_ = resources_use_header_bar ();
 #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_saved_search_dialog_search_row_container_unref0 (_tmp8_);
-#line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->dialog;
+	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
 #line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 660 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_setup_dialog (self);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp1_ = self->priv->search_title;
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp2_ = saved_search_table_get_instance ();
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp3_ = _tmp2_;
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp4_ = saved_search_table_generate_unique_name (_tmp3_);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp5_ = _tmp4_;
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_entry_set_text (_tmp1_, _tmp5_);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_free0 (_tmp5_);
+#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_saved_search_table_unref0 (_tmp3_);
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp6_ = self->priv->search_title;
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1);
+#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_add_text_search (self);
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp7_ = self->priv->row_list;
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp9_ = (SavedSearchDialogSearchRowContainer*) _tmp8_;
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_allow_removal (_tmp9_, FALSE);
+#line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_saved_search_dialog_search_row_container_unref0 (_tmp9_);
+#line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, FALSE);
-#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 893 "SavedSearchDialog.c"
+#line 870 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new (void) {
-#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG);
-#line 900 "SavedSearchDialog.c"
+#line 877 "SavedSearchDialog.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 907 "SavedSearchDialog.c"
+#line 884 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search) {
-	SavedSearchDialog* self = NULL;
-	SavedSearch* _tmp0_;
+	SavedSearchDialog * self = NULL;
+	gint _tmp0_;
 	SavedSearch* _tmp1_;
-	GtkDialog* _tmp2_;
+	SavedSearch* _tmp2_;
 	GtkComboBoxText* _tmp3_;
 	SavedSearch* _tmp4_;
 	SearchOperator _tmp5_;
@@ -922,47 +899,47 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 	GeeArrayList* _tmp24_;
 	gint _tmp25_;
 	gint _tmp26_;
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL);
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialog*) g_type_create_instance (object_type);
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = saved_search;
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp0_ = resources_use_header_bar ();
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp1_ = saved_search;
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->previous_search = _tmp1_;
-#line 665 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->previous_search = _tmp2_;
+#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->edit_mode = TRUE;
-#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_setup_dialog (self);
-#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->dialog;
-#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->operator;
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = saved_search;
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = saved_search_get_operator (_tmp4_);
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) _tmp5_));
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->search_title;
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = saved_search;
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_text (_tmp6_, _tmp9_);
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp9_);
-#line 966 "SavedSearchDialog.c"
+#line 943 "SavedSearchDialog.c"
 	{
 		GeeList* _sc_list = NULL;
 		SavedSearch* _tmp10_;
@@ -972,25 +949,25 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 		gint _tmp13_;
 		gint _tmp14_;
 		gint _sc_index = 0;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp10_ = saved_search;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp11_ = saved_search_get_conditions (_tmp10_);
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_list = _tmp11_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp12_ = _sc_list;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp14_ = _tmp13_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_size = _tmp14_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_index = -1;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		while (TRUE) {
-#line 994 "SavedSearchDialog.c"
+#line 971 "SavedSearchDialog.c"
 			gint _tmp15_;
 			gint _tmp16_;
 			gint _tmp17_;
@@ -1001,330 +978,183 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 			SearchCondition* _tmp21_;
 			SavedSearchDialogSearchRowContainer* _tmp22_;
 			SavedSearchDialogSearchRowContainer* _tmp23_;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = _sc_index;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_sc_index = _tmp15_ + 1;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp16_ = _sc_index;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp17_ = _sc_size;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (!(_tmp16_ < _tmp17_)) {
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				break;
-#line 1017 "SavedSearchDialog.c"
+#line 994 "SavedSearchDialog.c"
 			}
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp18_ = _sc_list;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp19_ = _sc_index;
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp20_ = gee_list_get (_tmp18_, _tmp19_);
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			sc = (SearchCondition*) _tmp20_;
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp21_ = sc;
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp22_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp21_);
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp23_ = _tmp22_;
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			saved_search_dialog_add_row (self, _tmp23_);
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_container_unref0 (_tmp23_);
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_search_condition_unref0 (sc);
-#line 1039 "SavedSearchDialog.c"
+#line 1016 "SavedSearchDialog.c"
 		}
-#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_sc_list);
-#line 1043 "SavedSearchDialog.c"
+#line 1020 "SavedSearchDialog.c"
 	}
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->row_list;
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = _tmp25_;
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp26_ == 1) {
-#line 1053 "SavedSearchDialog.c"
+#line 1030 "SavedSearchDialog.c"
 		GeeArrayList* _tmp27_;
 		gpointer _tmp28_;
 		SavedSearchDialogSearchRowContainer* _tmp29_;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp27_ = self->priv->row_list;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp29_ = (SavedSearchDialogSearchRowContainer*) _tmp28_;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE);
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp29_);
-#line 1067 "SavedSearchDialog.c"
+#line 1044 "SavedSearchDialog.c"
 	}
-#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 692 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 1073 "SavedSearchDialog.c"
+#line 1050 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) {
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search);
-#line 1080 "SavedSearchDialog.c"
+#line 1057 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id);
-#line 1087 "SavedSearchDialog.c"
+#line 1064 "SavedSearchDialog.c"
 }
 
 
-static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	gboolean result;
-	result = saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self, event);
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 1096 "SavedSearchDialog.c"
+static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self);
+#line 1071 "SavedSearchDialog.c"
+}
+
+
+static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_on_title_changed ((SavedSearchDialog*) self);
+#line 1078 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) {
-	GtkBuilder* _tmp0_;
+	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
-	AppWindow* _tmp2_;
-	GdkWindow* _tmp3_;
-	GtkDialog* _tmp4_;
-	GtkDialog* _tmp5_;
-	GtkDialog* _tmp6_;
-	AppWindow* _tmp7_;
-	AppWindow* _tmp8_;
-	GtkDialog* _tmp9_;
-	GtkDialog* _tmp10_;
-	GtkDialog* _tmp11_;
-	GtkBox* _tmp12_;
-	GtkBuilder* _tmp13_;
-	GObject* _tmp14_;
-	GtkDialog* _tmp15_;
-	GtkBuilder* _tmp16_;
-	GObject* _tmp17_;
-	GtkButton* _tmp18_;
-	GtkButton* _tmp19_;
-	GtkBuilder* _tmp20_;
-	GObject* _tmp21_;
-	GtkEntry* _tmp22_;
-	GtkEntry* _tmp23_;
-	GtkEntry* _tmp24_;
-	GtkBuilder* _tmp25_;
-	GObject* _tmp26_;
-	GtkBox* _tmp27_;
-	GtkBuilder* _tmp28_;
-	GObject* _tmp29_;
-	GtkComboBoxText* _tmp30_;
-	GtkComboBoxText* _tmp31_;
-	GtkComboBoxText* _tmp32_;
-	GtkComboBoxText* _tmp33_;
-	GtkComboBoxText* _tmp34_;
-#line 688 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	GtkButton* _tmp2_;
+	GtkEntry* _tmp3_;
+#line 696 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->builder = _tmp0_;
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = app_window_get_instance ();
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = _tmp1_;
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = (GtkDialog*) gtk_dialog_new_with_buttons (_ ("Search"), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _ ("Cancel"), GTK_RESPONSE_CANCEL, _ ("OK"), GTK_RESPONSE_OK, NULL, NULL);
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp4_);
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->dialog);
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->dialog = _tmp4_;
-#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp2_);
-#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->dialog;
-#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow), FALSE);
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp1_ = _tmp0_;
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
+#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_object_unref0 (_tmp1_);
+#line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self, 0);
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->dialog;
+	_tmp2_ = self->priv->add_criteria;
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = app_window_get_instance ();
-#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = _tmp7_;
-#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
-#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp8_);
-#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->dialog;
-#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_default_response (_tmp9_, (gint) GTK_RESPONSE_OK);
+	g_signal_connect_object (_tmp2_, "clicked", (GCallback) _saved_search_dialog_on_add_criteria_gtk_button_clicked, self, 0);
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->dialog;
+	_tmp3_ = self->priv->search_title;
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp10_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self);
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->dialog;
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = (GtkBox*) gtk_dialog_get_content_area (_tmp11_);
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->builder;
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "criteria");
-#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp14_) : NULL);
-#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->dialog;
-#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_default_response (_tmp15_, (gint) GTK_RESPONSE_OK);
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->builder;
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "Add search button");
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->add_criteria);
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->add_criteria = _tmp18_;
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = self->priv->add_criteria;
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->builder;
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "Search title");
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp21_) : NULL);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->search_title);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_title = _tmp22_;
-#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->search_title;
-#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_activates_default (_tmp23_, TRUE);
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->search_title;
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->builder;
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = gtk_builder_get_object (_tmp25_, "row_box");
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_box_get_type ()) ? ((GtkBox*) _tmp26_) : NULL);
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->row_box);
-#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->row_box = _tmp27_;
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = self->priv->builder;
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "Type of search criteria");
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp29_) : NULL);
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->operator);
-#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->operator = _tmp30_;
-#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = self->priv->operator;
-#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp31_, _ ("any"));
-#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = self->priv->operator;
-#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp32_, _ ("all"));
-#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp33_ = self->priv->operator;
-#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp33_, _ ("none"));
-#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp34_ = self->priv->operator;
-#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1264 "SavedSearchDialog.c"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self, 0);
+#line 1107 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_show (SavedSearchDialog* self) {
-	GtkDialog* _tmp0_;
-	GtkDialog* _tmp1_;
-#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = self->priv->dialog;
-#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_run (_tmp0_);
-#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = self->priv->dialog;
-#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1281 "SavedSearchDialog.c"
+#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 1118 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, GdkEventButton* event) {
-	gboolean result = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 730 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self) {
+#line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
+#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_text_search (self);
-#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	result = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 1297 "SavedSearchDialog.c"
+#line 1127 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_add_text_search (SavedSearchDialog* self) {
 	SavedSearchDialogSearchRowContainer* text = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_search_row_container_new ();
-#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp0_;
-#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_row (self, text);
-#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (text);
-#line 1314 "SavedSearchDialog.c"
+#line 1144 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row);
-#line 1321 "SavedSearchDialog.c"
+#line 1151 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row);
-#line 1328 "SavedSearchDialog.c"
+#line 1158 "SavedSearchDialog.c"
 }
 
 
@@ -1332,7 +1162,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
-	GtkBox* _tmp6_;
+	GtkListBox* _tmp6_;
 	SavedSearchDialogSearchRowContainer* _tmp7_;
 	GtkWidget* _tmp8_;
 	GtkWidget* _tmp9_;
@@ -1342,67 +1172,67 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	SavedSearchDialogSearchRowContainer* _tmp13_;
 	SavedSearchDialogSearchRowContainer* _tmp14_;
 	gboolean _tmp15_;
-#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->row_list;
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == 1) {
-#line 1358 "SavedSearchDialog.c"
+#line 1188 "SavedSearchDialog.c"
 		GeeArrayList* _tmp3_;
 		gpointer _tmp4_;
 		SavedSearchDialogSearchRowContainer* _tmp5_;
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->row_list;
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = (SavedSearchDialogSearchRowContainer*) _tmp4_;
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE);
-#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp5_);
-#line 1372 "SavedSearchDialog.c"
+#line 1202 "SavedSearchDialog.c"
 	}
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->row_box;
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp6_ = self->priv->row_listbox;
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = row;
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = saved_search_dialog_search_row_container_get_widget (_tmp7_);
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp9_);
-#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp9_);
-#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->row_list;
-#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = row;
-#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = row;
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect_object (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self, 0);
+#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = row;
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect_object (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self, 0);
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = row;
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_);
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp15_);
-#line 1406 "SavedSearchDialog.c"
+#line 1236 "SavedSearchDialog.c"
 }
 
 
@@ -1411,88 +1241,91 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea
 	guint _tmp1_;
 	SavedSearchDialogSearchRowContainer* _tmp2_;
 	guint _tmp3_;
-	GtkBox* _tmp4_;
+	GtkListBox* _tmp4_;
 	SavedSearchDialogSearchRowContainer* _tmp5_;
 	GtkWidget* _tmp6_;
 	GtkWidget* _tmp7_;
-	GeeArrayList* _tmp8_;
-	SavedSearchDialogSearchRowContainer* _tmp9_;
-	GeeArrayList* _tmp10_;
-	gint _tmp11_;
+	GtkContainer* _tmp8_;
+	GeeArrayList* _tmp9_;
+	SavedSearchDialogSearchRowContainer* _tmp10_;
+	GeeArrayList* _tmp11_;
 	gint _tmp12_;
-#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gint _tmp13_;
+#line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = row;
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE);
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
-#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = row;
-#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp3_, NULL, FALSE);
-#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->row_box;
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp4_ = self->priv->row_listbox;
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = row;
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = saved_search_dialog_search_row_container_get_widget (_tmp5_);
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), _tmp7_);
-#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp8_ = (GtkContainer*) gtk_widget_get_parent (_tmp7_);
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp7_);
-#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->row_list;
-#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = row;
-#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->row_list;
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = _tmp11_;
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp12_ == 1) {
-#line 1466 "SavedSearchDialog.c"
-		GeeArrayList* _tmp13_;
-		gpointer _tmp14_;
-		SavedSearchDialogSearchRowContainer* _tmp15_;
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp13_ = self->priv->row_list;
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp15_ = (SavedSearchDialogSearchRowContainer*) _tmp14_;
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_search_row_container_allow_removal (_tmp15_, FALSE);
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_saved_search_dialog_search_row_container_unref0 (_tmp15_);
-#line 1480 "SavedSearchDialog.c"
+#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp9_ = self->priv->row_list;
+#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp10_ = row;
+#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp11_ = self->priv->row_list;
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp13_ = _tmp12_;
+#line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	if (_tmp13_ == 1) {
+#line 1299 "SavedSearchDialog.c"
+		GeeArrayList* _tmp14_;
+		gpointer _tmp15_;
+		SavedSearchDialogSearchRowContainer* _tmp16_;
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_tmp14_ = self->priv->row_list;
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_tmp16_ = (SavedSearchDialogSearchRowContainer*) _tmp15_;
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		saved_search_dialog_search_row_container_allow_removal (_tmp16_, FALSE);
+#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_saved_search_dialog_search_row_container_unref0 (_tmp16_);
+#line 1313 "SavedSearchDialog.c"
 	}
-#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 1484 "SavedSearchDialog.c"
+#line 1317 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) {
 	gint _tmp0_;
-#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = response_id;
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 1496 "SavedSearchDialog.c"
+#line 1329 "SavedSearchDialog.c"
 		gboolean _tmp1_ = FALSE;
 		SavedSearchTable* _tmp2_;
 		SavedSearchTable* _tmp3_;
@@ -1514,111 +1347,111 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 		GeeArrayList* _tmp46_;
 		SavedSearch* _tmp47_;
 		SavedSearch* _tmp48_;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_table_get_instance ();
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = _tmp2_;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->search_title;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = saved_search_table_exists (_tmp3_, _tmp5_);
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp7_ = _tmp6_;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_table_unref0 (_tmp3_);
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp7_) {
-#line 1534 "SavedSearchDialog.c"
+#line 1367 "SavedSearchDialog.c"
 			gboolean _tmp8_ = FALSE;
 			gboolean _tmp9_;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = self->priv->edit_mode;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp9_) {
-#line 1541 "SavedSearchDialog.c"
+#line 1374 "SavedSearchDialog.c"
 				SavedSearch* _tmp10_;
 				gchar* _tmp11_;
 				gchar* _tmp12_;
 				GtkEntry* _tmp13_;
 				const gchar* _tmp14_;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp10_ = self->priv->previous_search;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp11_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp12_ = _tmp11_;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp13_ = self->priv->search_title;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp14_ = gtk_entry_get_text (_tmp13_);
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0;
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp12_);
-#line 1561 "SavedSearchDialog.c"
+#line 1394 "SavedSearchDialog.c"
 			} else {
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = FALSE;
-#line 1565 "SavedSearchDialog.c"
+#line 1398 "SavedSearchDialog.c"
 			}
-#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = !_tmp8_;
-#line 1569 "SavedSearchDialog.c"
+#line 1402 "SavedSearchDialog.c"
 		} else {
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = FALSE;
-#line 1573 "SavedSearchDialog.c"
+#line 1406 "SavedSearchDialog.c"
 		}
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_) {
-#line 1577 "SavedSearchDialog.c"
+#line 1410 "SavedSearchDialog.c"
 			GtkEntry* _tmp15_;
 			const gchar* _tmp16_;
 			gchar* _tmp17_;
 			gchar* _tmp18_;
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = self->priv->search_title;
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp16_ = gtk_entry_get_text (_tmp15_);
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp18_ = _tmp17_;
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			app_window_error_message (_tmp18_, NULL);
-#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_free0 (_tmp18_);
-#line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return;
-#line 1596 "SavedSearchDialog.c"
+#line 1429 "SavedSearchDialog.c"
 		}
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp19_ = self->priv->edit_mode;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp19_) {
-#line 1602 "SavedSearchDialog.c"
+#line 1435 "SavedSearchDialog.c"
 			SavedSearchTable* _tmp20_;
 			SavedSearchTable* _tmp21_;
 			SavedSearch* _tmp22_;
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp20_ = saved_search_table_get_instance ();
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp21_ = _tmp20_;
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp22_ = self->priv->previous_search;
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			saved_search_table_remove (_tmp21_, _tmp22_);
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_table_unref0 (_tmp21_);
-#line 1616 "SavedSearchDialog.c"
+#line 1449 "SavedSearchDialog.c"
 		}
-#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
-#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		conditions = _tmp23_;
-#line 1622 "SavedSearchDialog.c"
+#line 1455 "SavedSearchDialog.c"
 		{
 			GeeArrayList* _c_list = NULL;
 			GeeArrayList* _tmp24_;
@@ -1628,25 +1461,25 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 			gint _tmp27_;
 			gint _tmp28_;
 			gint _c_index = 0;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp24_ = self->priv->row_list;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_list = _tmp25_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp26_ = _c_list;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp28_ = _tmp27_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_size = _tmp28_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_index = -1;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 1650 "SavedSearchDialog.c"
+#line 1483 "SavedSearchDialog.c"
 				gint _tmp29_;
 				gint _tmp30_;
 				gint _tmp31_;
@@ -1658,77 +1491,77 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 				SavedSearchDialogSearchRowContainer* _tmp36_;
 				SearchCondition* _tmp37_;
 				SearchCondition* _tmp38_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp29_ = _c_index;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_c_index = _tmp29_ + 1;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp30_ = _c_index;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp31_ = _c_size;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!(_tmp30_ < _tmp31_)) {
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 1674 "SavedSearchDialog.c"
+#line 1507 "SavedSearchDialog.c"
 				}
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp32_ = _c_list;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp33_ = _c_index;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp34_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp33_);
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				c = (SavedSearchDialogSearchRowContainer*) _tmp34_;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp35_ = conditions;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp36_ = c;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp37_ = saved_search_dialog_search_row_container_get_search_condition (_tmp36_);
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp38_ = _tmp37_;
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
-#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_search_condition_unref0 (_tmp38_);
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_saved_search_dialog_search_row_container_unref0 (c);
-#line 1698 "SavedSearchDialog.c"
+#line 1531 "SavedSearchDialog.c"
 			}
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_object_unref0 (_c_list);
-#line 1702 "SavedSearchDialog.c"
+#line 1535 "SavedSearchDialog.c"
 		}
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp39_ = self->priv->operator;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp40_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox));
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		search_operator = (SearchOperator) _tmp40_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp41_ = saved_search_table_get_instance ();
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp42_ = _tmp41_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp43_ = self->priv->search_title;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp44_ = gtk_entry_get_text (_tmp43_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp45_ = search_operator;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp46_ = conditions;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp47_ = saved_search_table_create (_tmp42_, _tmp44_, _tmp45_, _tmp46_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp48_ = _tmp47_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp48_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_table_unref0 (_tmp42_);
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (conditions);
-#line 1732 "SavedSearchDialog.c"
+#line 1565 "SavedSearchDialog.c"
 	}
 }
 
@@ -1736,29 +1569,29 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	gboolean _tmp1_;
-#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = row;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_);
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp1_);
-#line 1750 "SavedSearchDialog.c"
+#line 1583 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) {
 	gboolean _tmp0_;
-#line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 772 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_is_title_valid (self);
-#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp0_);
-#line 1762 "SavedSearchDialog.c"
+#line 1595 "SavedSearchDialog.c"
 }
 
 
@@ -1781,7 +1614,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1785 "SavedSearchDialog.c"
+#line 1618 "SavedSearchDialog.c"
 }
 
 
@@ -1801,147 +1634,146 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 	const gchar* _tmp17_;
 	gboolean _tmp18_;
 	gboolean _tmp19_;
-#line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->edit_mode;
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_) {
-#line 1811 "SavedSearchDialog.c"
+#line 1644 "SavedSearchDialog.c"
 		SavedSearch* _tmp3_;
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->previous_search;
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1817 "SavedSearchDialog.c"
+#line 1650 "SavedSearchDialog.c"
 	} else {
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = FALSE;
-#line 1821 "SavedSearchDialog.c"
+#line 1654 "SavedSearchDialog.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 1825 "SavedSearchDialog.c"
+#line 1658 "SavedSearchDialog.c"
 		SavedSearch* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
 		GtkEntry* _tmp7_;
 		const gchar* _tmp8_;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->previous_search;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = _tmp5_;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp7_ = self->priv->search_title;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = gtk_entry_get_text (_tmp7_);
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0;
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_free0 (_tmp6_);
-#line 1845 "SavedSearchDialog.c"
+#line 1678 "SavedSearchDialog.c"
 	} else {
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = FALSE;
-#line 1849 "SavedSearchDialog.c"
+#line 1682 "SavedSearchDialog.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = TRUE;
-#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1857 "SavedSearchDialog.c"
+#line 1690 "SavedSearchDialog.c"
 	}
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->search_title;
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = string_chomp (_tmp10_);
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _tmp11_;
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = g_strcmp0 (_tmp12_, "") == 0;
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp12_);
-#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp13_) {
-#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = FALSE;
-#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1877 "SavedSearchDialog.c"
+#line 1710 "SavedSearchDialog.c"
 	}
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_table_get_instance ();
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->search_title;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = gtk_entry_get_text (_tmp16_);
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = saved_search_table_exists (_tmp15_, _tmp17_);
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = _tmp18_;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_table_unref0 (_tmp15_);
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp19_) {
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = FALSE;
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1899 "SavedSearchDialog.c"
+#line 1732 "SavedSearchDialog.c"
 	}
-#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1905 "SavedSearchDialog.c"
+#line 1738 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) {
 	gboolean _tmp0_;
-	GtkDialog* _tmp22_;
-	gboolean _tmp23_;
-#line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gboolean _tmp22_;
+#line 788 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = v;
-#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!_tmp0_) {
-#line 808 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self->priv->valid = FALSE;
-#line 1921 "SavedSearchDialog.c"
+#line 1753 "SavedSearchDialog.c"
 	} else {
 		gboolean _tmp1_;
 		gboolean _tmp2_;
-#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = v;
-#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = self->priv->valid;
-#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_ != _tmp2_) {
-#line 1931 "SavedSearchDialog.c"
+#line 1763 "SavedSearchDialog.c"
 			gboolean _tmp3_;
-#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp3_ = saved_search_dialog_is_title_valid (self);
-#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp3_) {
-#line 1937 "SavedSearchDialog.c"
+#line 1769 "SavedSearchDialog.c"
 				gint valid_rows = 0;
 				gint _tmp18_;
 				GeeArrayList* _tmp19_;
 				gint _tmp20_;
 				gint _tmp21_;
-#line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				valid_rows = 0;
-#line 1945 "SavedSearchDialog.c"
+#line 1777 "SavedSearchDialog.c"
 				{
 					GeeArrayList* _c_list = NULL;
 					GeeArrayList* _tmp4_;
@@ -1951,25 +1783,25 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 					gint _tmp7_;
 					gint _tmp8_;
 					gint _c_index = 0;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp4_ = self->priv->row_list;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_list = _tmp5_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp6_ = _c_list;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp8_ = _tmp7_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_size = _tmp8_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_index = -1;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					while (TRUE) {
-#line 1973 "SavedSearchDialog.c"
+#line 1805 "SavedSearchDialog.c"
 						gint _tmp9_;
 						gint _tmp10_;
 						gint _tmp11_;
@@ -1979,96 +1811,94 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 						gpointer _tmp14_;
 						SavedSearchDialogSearchRowContainer* _tmp15_;
 						gboolean _tmp16_;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp9_ = _c_index;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_c_index = _tmp9_ + 1;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp10_ = _c_index;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp11_ = _c_size;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						if (!(_tmp10_ < _tmp11_)) {
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							break;
-#line 1995 "SavedSearchDialog.c"
+#line 1827 "SavedSearchDialog.c"
 						}
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp12_ = _c_list;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp13_ = _c_index;
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_);
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						c = (SavedSearchDialogSearchRowContainer*) _tmp14_;
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp15_ = c;
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_);
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						if (_tmp16_) {
-#line 2011 "SavedSearchDialog.c"
+#line 1843 "SavedSearchDialog.c"
 							gint _tmp17_;
-#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							_tmp17_ = valid_rows;
-#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							valid_rows = _tmp17_ + 1;
-#line 2017 "SavedSearchDialog.c"
+#line 1849 "SavedSearchDialog.c"
 						}
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_saved_search_dialog_search_row_container_unref0 (c);
-#line 2021 "SavedSearchDialog.c"
+#line 1853 "SavedSearchDialog.c"
 					}
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_g_object_unref0 (_c_list);
-#line 2025 "SavedSearchDialog.c"
+#line 1857 "SavedSearchDialog.c"
 				}
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp18_ = valid_rows;
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp19_ = self->priv->row_list;
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp21_ = _tmp20_;
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = _tmp18_ == _tmp21_;
-#line 2037 "SavedSearchDialog.c"
+#line 1869 "SavedSearchDialog.c"
 			} else {
-#line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = FALSE;
-#line 2041 "SavedSearchDialog.c"
+#line 1873 "SavedSearchDialog.c"
 			}
 		}
 	}
-#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->dialog;
-#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->valid;
-#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_response_sensitive (_tmp22_, (gint) GTK_RESPONSE_OK, _tmp23_);
-#line 2051 "SavedSearchDialog.c"
+#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp22_ = self->priv->valid;
+#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp22_);
+#line 1881 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type) {
 	SavedSearchDialogSearchRowContainer* self = NULL;
-#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_setup_gui (self);
+	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 25 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_setup_gui (self);
+#line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
-#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2065 "SavedSearchDialog.c"
+#line 1895 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) {
-#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2072 "SavedSearchDialog.c"
+#line 1902 "SavedSearchDialog.c"
 }
 
 
@@ -2082,60 +1912,58 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta
 	SearchConditionSearchType _tmp5_;
 	SavedSearchDialogSearchRow* _tmp6_;
 	SearchCondition* _tmp7_;
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL);
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_setup_gui (self);
+	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
 #line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_setup_gui (self);
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = search_condition_get_search_type (_tmp0_);
-#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type (self, _tmp2_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_set_type (self, _tmp2_);
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = sc;
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = search_condition_get_search_type (_tmp3_);
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_);
+#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->my_row;
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = sc;
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_populate (_tmp6_, _tmp7_);
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2116 "SavedSearchDialog.c"
+#line 1946 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) {
-#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc);
-#line 2123 "SavedSearchDialog.c"
+#line 1953 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self);
-#line 2130 "SavedSearchDialog.c"
+#line 1960 "SavedSearchDialog.c"
 }
 
 
-static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
-	gboolean result;
-	result = saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self, event);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 2139 "SavedSearchDialog.c"
+static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self);
+#line 1967 "SavedSearchDialog.c"
 }
 
 
@@ -2147,53 +1975,58 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 	GtkComboBoxText* _tmp18_;
 	GtkButton* _tmp19_;
 	GtkButton* _tmp20_;
-	GtkBox* _tmp21_;
+	GtkButton* _tmp21_;
 	GtkBox* _tmp22_;
-	GtkComboBoxText* _tmp23_;
-	GtkBox* _tmp24_;
-	GtkButton* _tmp25_;
-	GtkBox* _tmp26_;
-#line 36 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
+	GtkBox* _tmp23_;
+	GtkComboBoxText* _tmp24_;
+	GtkBox* _tmp25_;
+	GtkButton* _tmp26_;
+	GtkBox* _tmp27_;
+	GtkBox* _tmp28_;
+	GtkBox* _tmp29_;
+	GtkBox* _tmp30_;
+	GtkBox* _tmp31_;
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = search_condition_search_type_as_array (&_tmp0_);
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types = (g_free (self->priv->search_types), NULL);
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types = _tmp1_;
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types_length1 = _tmp0_;
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->_search_types_size_ = self->priv->search_types_length1;
 #line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->_search_types_size_ = self->priv->search_types_length1;
+#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = gee_hash_map_new (SEARCH_CONDITION_TYPE_SEARCH_TYPE, NULL, NULL, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_types_index);
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_types_index = _tmp2_;
 #line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->search_types_index = _tmp2_;
+#line 40 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_condition_search_type_sort_array (&self->priv->search_types, &self->priv->search_types_length1);
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp3_);
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->type_combo);
-#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->type_combo = _tmp3_;
-#line 2185 "SavedSearchDialog.c"
+#line 2018 "SavedSearchDialog.c"
 	{
 		gint i = 0;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		i = 0;
-#line 2190 "SavedSearchDialog.c"
+#line 2023 "SavedSearchDialog.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp4_ = TRUE;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 2197 "SavedSearchDialog.c"
+#line 2030 "SavedSearchDialog.c"
 				gint _tmp6_;
 				SearchConditionSearchType* _tmp7_;
 				gint _tmp7__length1;
@@ -2209,121 +2042,141 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				SearchConditionSearchType _tmp15_;
 				gchar* _tmp16_;
 				gchar* _tmp17_;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!_tmp4_) {
-#line 2215 "SavedSearchDialog.c"
+#line 2048 "SavedSearchDialog.c"
 					gint _tmp5_;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = i;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					i = _tmp5_ + 1;
-#line 2221 "SavedSearchDialog.c"
+#line 2054 "SavedSearchDialog.c"
 				}
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp4_ = FALSE;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp6_ = i;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp7_ = self->priv->search_types;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp7__length1 = self->priv->search_types_length1;
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!(_tmp6_ < _tmp7__length1)) {
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 2235 "SavedSearchDialog.c"
+#line 2068 "SavedSearchDialog.c"
 				}
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = self->priv->search_types;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8__length1 = self->priv->search_types_length1;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp9_ = i;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp10_ = _tmp8_[_tmp9_];
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				st = _tmp10_;
 #line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+				st = _tmp10_;
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp11_ = self->priv->search_types_index;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp12_ = st;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp13_ = i;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_), (gpointer) ((gintptr) _tmp13_));
 #line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_), (gpointer) ((gintptr) _tmp13_));
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp14_ = self->priv->type_combo;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp15_ = st;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp16_ = search_condition_search_type_display_text (_tmp15_);
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp17_ = _tmp16_;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				gtk_combo_box_text_append_text (_tmp14_, _tmp17_);
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp17_);
-#line 2267 "SavedSearchDialog.c"
+#line 2100 "SavedSearchDialog.c"
 			}
 		}
 	}
-#line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type_combo_box (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
 #line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_container_set_type_combo_box (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
+#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->type_combo;
-#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed, self);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->remove_button);
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->remove_button = _tmp19_;
 #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->remove_button = _tmp19_;
+#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->remove_button;
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event, self);
+#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_button_set_relief (_tmp20_, GTK_RELIEF_NONE);
 #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp21_ = self->priv->remove_button;
 #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp21_);
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->box);
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp21_;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->box;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->type_combo;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	g_signal_connect (_tmp21_, "clicked", (GCallback) _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked, self);
 #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->box;
+	_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->remove_button;
+	g_object_ref_sink (_tmp22_);
+#line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_object_unref0 (self->priv->box);
 #line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_end (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	self->priv->box = _tmp22_;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->box;
+	_tmp23_ = self->priv->box;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 2313 "SavedSearchDialog.c"
+	_tmp24_ = self->priv->type_combo;
+#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_box_pack_start (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp25_ = self->priv->box;
+#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp26_ = self->priv->remove_button;
+#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_box_pack_end (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp27_ = self->priv->box;
+#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), 2);
+#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp28_ = self->priv->box;
+#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 2);
+#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp29_ = self->priv->box;
+#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), 8);
+#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp30_ = self->priv->box;
+#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), 8);
+#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp31_ = self->priv->box;
+#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+#line 2166 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) {
 	SearchConditionSearchType _tmp0_;
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_search_row_container_get_search_type (self);
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, _tmp0_);
-#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, self);
-#line 2327 "SavedSearchDialog.c"
+#line 2180 "SavedSearchDialog.c"
 }
 
 
@@ -2332,19 +2185,19 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe
 	GeeHashMap* _tmp1_;
 	SearchConditionSearchType _tmp2_;
 	gpointer _tmp3_;
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->type_combo;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->search_types_index;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = st;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_));
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_));
-#line 2348 "SavedSearchDialog.c"
+#line 2201 "SavedSearchDialog.c"
 }
 
 
@@ -2355,155 +2208,155 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 	SavedSearchDialogSearchRow* _tmp13_;
 	GtkWidget* _tmp14_;
 	GtkWidget* _tmp15_;
-#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ != NULL) {
-#line 2365 "SavedSearchDialog.c"
+#line 2218 "SavedSearchDialog.c"
 		GtkBox* _tmp1_;
 		SavedSearchDialogSearchRow* _tmp2_;
 		GtkWidget* _tmp3_;
 		GtkWidget* _tmp4_;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = self->priv->box;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = self->priv->my_row;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = saved_search_dialog_search_row_get_widget (_tmp2_);
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = _tmp3_;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_);
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2382 "SavedSearchDialog.c"
+#line 2235 "SavedSearchDialog.c"
 	}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = type;
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	switch (_tmp5_) {
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TAG:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 2400 "SavedSearchDialog.c"
+#line 2253 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowText* _tmp6_;
-#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp6_ = saved_search_dialog_search_row_text_new (self);
-#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2411 "SavedSearchDialog.c"
+#line 2264 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 2415 "SavedSearchDialog.c"
+#line 2268 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowMediaType* _tmp7_;
-#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = saved_search_dialog_search_row_media_type_new (self);
-#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2426 "SavedSearchDialog.c"
+#line 2279 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 2430 "SavedSearchDialog.c"
+#line 2283 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowFlagged* _tmp8_;
-#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp8_ = saved_search_dialog_search_row_flagged_new (self);
-#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 94 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2441 "SavedSearchDialog.c"
+#line 2294 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 2445 "SavedSearchDialog.c"
+#line 2298 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowModified* _tmp9_;
-#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = saved_search_dialog_search_row_modified_new (self);
-#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 98 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2456 "SavedSearchDialog.c"
+#line 2309 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 2460 "SavedSearchDialog.c"
+#line 2313 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowRating* _tmp10_;
-#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = saved_search_dialog_search_row_rating_new (self);
-#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 102 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2471 "SavedSearchDialog.c"
+#line 2324 "SavedSearchDialog.c"
 		}
-#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 2475 "SavedSearchDialog.c"
+#line 2328 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowDate* _tmp11_;
-#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp11_ = saved_search_dialog_search_row_date_new (self);
-#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2486 "SavedSearchDialog.c"
+#line 2339 "SavedSearchDialog.c"
 		}
 		default:
 		{
-#line 103 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			g_assert_not_reached ();
-#line 2492 "SavedSearchDialog.c"
+#line 2345 "SavedSearchDialog.c"
 		}
 	}
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->box;
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->my_row;
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_dialog_search_row_get_widget (_tmp13_);
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0);
-#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2507 "SavedSearchDialog.c"
+#line 2360 "SavedSearchDialog.c"
 }
 
 
@@ -2514,54 +2367,47 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se
 	GtkComboBoxText* _tmp1_;
 	gint _tmp2_;
 	SearchConditionSearchType _tmp3_;
-#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0);
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->search_types;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0__length1 = self->priv->search_types_length1;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->type_combo;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = _tmp0_[_tmp2_];
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2534 "SavedSearchDialog.c"
+#line 2387 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self, GdkEventButton* event) {
-	gboolean result = FALSE;
-#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
-#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
-#line 114 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self) {
+#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
+#line 120 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL], 0, self);
-#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	result = FALSE;
-#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return result;
-#line 2550 "SavedSearchDialog.c"
+#line 2396 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) {
 	GtkButton* _tmp0_;
 	gboolean _tmp1_;
-#line 118 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->remove_button;
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = allow;
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2565 "SavedSearchDialog.c"
+#line 2411 "SavedSearchDialog.c"
 }
 
 
@@ -2569,17 +2415,17 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 122 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2583 "SavedSearchDialog.c"
+#line 2429 "SavedSearchDialog.c"
 }
 
 
@@ -2587,17 +2433,17 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond
 	SearchCondition* result = NULL;
 	SavedSearchDialogSearchRow* _tmp0_;
 	SearchCondition* _tmp1_;
-#line 126 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_get_search_condition (_tmp0_);
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2601 "SavedSearchDialog.c"
+#line 2447 "SavedSearchDialog.c"
 }
 
 
@@ -2605,17 +2451,17 @@ static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearc
 	gboolean result = FALSE;
 	SavedSearchDialogSearchRow* _tmp0_;
 	gboolean _tmp1_;
-#line 130 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_is_complete (_tmp0_);
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2619 "SavedSearchDialog.c"
+#line 2465 "SavedSearchDialog.c"
 }
 
 
@@ -2626,255 +2472,255 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data1 = closure->data;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2638 "SavedSearchDialog.c"
+#line 2484 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = closure->data;
-#line 2644 "SavedSearchDialog.c"
+#line 2490 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2);
-#line 2650 "SavedSearchDialog.c"
+#line 2496 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_container_init (GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 2657 "SavedSearchDialog.c"
+#line 2503 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_container_free_value (GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (value->data[0].v_pointer) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (value->data[0].v_pointer);
-#line 2666 "SavedSearchDialog.c"
+#line 2512 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_search_row_container_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (src_value->data[0].v_pointer) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer);
-#line 2676 "SavedSearchDialog.c"
+#line 2522 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2680 "SavedSearchDialog.c"
+#line 2526 "SavedSearchDialog.c"
 	}
 }
 
 
 static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2688 "SavedSearchDialog.c"
+#line 2534 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 2695 "SavedSearchDialog.c"
+#line 2541 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowContainer * object;
 		object = collect_values[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2702 "SavedSearchDialog.c"
+#line 2548 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2706 "SavedSearchDialog.c"
+#line 2552 "SavedSearchDialog.c"
 		}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object);
-#line 2710 "SavedSearchDialog.c"
+#line 2556 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2714 "SavedSearchDialog.c"
+#line 2560 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2718 "SavedSearchDialog.c"
+#line 2564 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	SavedSearchDialogSearchRowContainer ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2729 "SavedSearchDialog.c"
+#line 2575 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 2735 "SavedSearchDialog.c"
+#line 2581 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2739 "SavedSearchDialog.c"
+#line 2585 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2743 "SavedSearchDialog.c"
+#line 2589 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2747 "SavedSearchDialog.c"
+#line 2593 "SavedSearchDialog.c"
 }
 
 
 static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	SavedSearchDialogParamSpecSearchRowContainer* spec;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 2761 "SavedSearchDialog.c"
+#line 2607 "SavedSearchDialog.c"
 }
 
 
 static gpointer saved_search_dialog_value_get_search_row_container (const GValue* value) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2770 "SavedSearchDialog.c"
+#line 2616 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRowContainer * old;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2790 "SavedSearchDialog.c"
+#line 2636 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2794 "SavedSearchDialog.c"
+#line 2640 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2800 "SavedSearchDialog.c"
+#line 2646 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRowContainer * old;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 2819 "SavedSearchDialog.c"
+#line 2665 "SavedSearchDialog.c"
 	} else {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2823 "SavedSearchDialog.c"
+#line 2669 "SavedSearchDialog.c"
 	}
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2829 "SavedSearchDialog.c"
+#line 2675 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_search_row_container_class_init (SavedSearchDialogSearchRowContainerClass * klass) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_parent_class = g_type_class_peek_parent (klass);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowContainerClass *) klass)->finalize = saved_search_dialog_search_row_container_finalize;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowContainerPrivate));
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL] = g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL] = g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2845 "SavedSearchDialog.c"
+#line 2691 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE (self);
-#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->my_row = NULL;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 2856 "SavedSearchDialog.c"
+#line 2702 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) {
 	SavedSearchDialogSearchRowContainer * self;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 15 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->type_combo);
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->box);
+	_g_object_unref0 (self->priv->type_combo);
 #line 17 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->remove_button);
+	_g_object_unref0 (self->priv->box);
 #line 18 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_types = (g_free (self->priv->search_types), NULL);
+	_g_object_unref0 (self->priv->remove_button);
 #line 19 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->search_types = (g_free (self->priv->search_types), NULL);
+#line 20 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_types_index);
-#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 2878 "SavedSearchDialog.c"
+#line 2724 "SavedSearchDialog.c"
 }
 
 
@@ -2895,322 +2741,322 @@ static GType saved_search_dialog_search_row_container_get_type (void) {
 static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) {
 	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 2903 "SavedSearchDialog.c"
+#line 2749 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_unref (gpointer instance) {
 	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self);
-#line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2916 "SavedSearchDialog.c"
+#line 2762 "SavedSearchDialog.c"
 	}
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self) {
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2926 "SavedSearchDialog.c"
+#line 2772 "SavedSearchDialog.c"
 }
 
 
 GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self) {
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
-#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self);
-#line 2935 "SavedSearchDialog.c"
+#line 2781 "SavedSearchDialog.c"
 }
 
 
 static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self) {
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2944 "SavedSearchDialog.c"
+#line 2790 "SavedSearchDialog.c"
 }
 
 
 SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self) {
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
-#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self);
-#line 2953 "SavedSearchDialog.c"
+#line 2799 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return;
-#line 2962 "SavedSearchDialog.c"
+#line 2808 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self));
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc);
-#line 2971 "SavedSearchDialog.c"
+#line 2817 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _tmp0_;
-#line 2981 "SavedSearchDialog.c"
+#line 2827 "SavedSearchDialog.c"
 }
 
 
 gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self) {
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE);
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self);
-#line 2990 "SavedSearchDialog.c"
+#line 2836 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type) {
 	SavedSearchDialogSearchRow* self = NULL;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3000 "SavedSearchDialog.c"
+#line 2846 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_init (GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 3007 "SavedSearchDialog.c"
+#line 2853 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_free_value (GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (value->data[0].v_pointer) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (value->data[0].v_pointer);
-#line 3016 "SavedSearchDialog.c"
+#line 2862 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_search_row_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (src_value->data[0].v_pointer) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer);
-#line 3026 "SavedSearchDialog.c"
+#line 2872 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3030 "SavedSearchDialog.c"
+#line 2876 "SavedSearchDialog.c"
 	}
 }
 
 
 static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3038 "SavedSearchDialog.c"
+#line 2884 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 3045 "SavedSearchDialog.c"
+#line 2891 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRow * object;
 		object = collect_values[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3052 "SavedSearchDialog.c"
+#line 2898 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3056 "SavedSearchDialog.c"
+#line 2902 "SavedSearchDialog.c"
 		}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_ref (object);
-#line 3060 "SavedSearchDialog.c"
+#line 2906 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3064 "SavedSearchDialog.c"
+#line 2910 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3068 "SavedSearchDialog.c"
+#line 2914 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	SavedSearchDialogSearchRow ** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3079 "SavedSearchDialog.c"
+#line 2925 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 3085 "SavedSearchDialog.c"
+#line 2931 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3089 "SavedSearchDialog.c"
+#line 2935 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3093 "SavedSearchDialog.c"
+#line 2939 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3097 "SavedSearchDialog.c"
+#line 2943 "SavedSearchDialog.c"
 }
 
 
 static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	SavedSearchDialogParamSpecSearchRow* spec;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 3111 "SavedSearchDialog.c"
+#line 2957 "SavedSearchDialog.c"
 }
 
 
 static gpointer saved_search_dialog_value_get_search_row (const GValue* value) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3120 "SavedSearchDialog.c"
+#line 2966 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRow * old;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3140 "SavedSearchDialog.c"
+#line 2986 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3144 "SavedSearchDialog.c"
+#line 2990 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3150 "SavedSearchDialog.c"
+#line 2996 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRow * old;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 3169 "SavedSearchDialog.c"
+#line 3015 "SavedSearchDialog.c"
 	} else {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3173 "SavedSearchDialog.c"
+#line 3019 "SavedSearchDialog.c"
 	}
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3179 "SavedSearchDialog.c"
+#line 3025 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_parent_class = g_type_class_peek_parent (klass);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_finalize;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_widget;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_get_search_condition;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete;
-#line 3197 "SavedSearchDialog.c"
+#line 3043 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 3204 "SavedSearchDialog.c"
+#line 3050 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) {
 	SavedSearchDialogSearchRow * self;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 3214 "SavedSearchDialog.c"
+#line 3060 "SavedSearchDialog.c"
 }
 
 
@@ -3231,46 +3077,46 @@ static GType saved_search_dialog_search_row_get_type (void) {
 static gpointer saved_search_dialog_search_row_ref (gpointer instance) {
 	SavedSearchDialogSearchRow * self;
 	self = instance;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 3239 "SavedSearchDialog.c"
+#line 3085 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_unref (gpointer instance) {
 	SavedSearchDialogSearchRow * self;
 	self = instance;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3252 "SavedSearchDialog.c"
+#line 3098 "SavedSearchDialog.c"
 	}
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3260 "SavedSearchDialog.c"
+#line 3106 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3267 "SavedSearchDialog.c"
+#line 3113 "SavedSearchDialog.c"
 }
 
 
 static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) {
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? saved_search_dialog_search_row_container_ref (self) : NULL;
-#line 3274 "SavedSearchDialog.c"
+#line 3120 "SavedSearchDialog.c"
 }
 
 
@@ -3298,116 +3144,116 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const
 	GtkBox* _tmp19_;
 	GtkEntry* _tmp20_;
 	GtkBox* _tmp21_;
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowText*) saved_search_dialog_search_row_construct (object_type);
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->text_context);
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->text_context = _tmp2_;
-#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->text_context;
-#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("contains"));
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->text_context;
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly"));
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->text_context;
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _ ("starts with"));
-#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->text_context;
-#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp6_, _ ("ends with"));
-#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->text_context;
-#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain"));
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->text_context;
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp8_, _ ("is not set"));
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->text_context;
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _ ("is set"));
-#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->text_context;
-#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->text_context;
-#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = (GtkEntry*) gtk_entry_new ();
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp12_);
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->entry = _tmp12_;
-#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->entry;
-#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_width_chars (_tmp13_, 25);
-#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->entry;
-#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_activates_default (_tmp14_, TRUE);
-#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->entry;
-#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp16_);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp16_;
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->box;
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->text_context;
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = self->priv->box;
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->entry;
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->box;
-#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3404 "SavedSearchDialog.c"
+#line 3250 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent);
-#line 3411 "SavedSearchDialog.c"
+#line 3257 "SavedSearchDialog.c"
 }
 
 
@@ -3416,17 +3262,17 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 188 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3430 "SavedSearchDialog.c"
+#line 3276 "SavedSearchDialog.c"
 }
 
 
@@ -3444,44 +3290,44 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond
 	SearchConditionTextContext _tmp5_;
 	SearchConditionText* c = NULL;
 	SearchConditionText* _tmp6_;
-#line 192 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	type = _tmp1_;
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp4_;
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = _tmp5_;
-#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_text_new (type, text, context);
-#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (text);
-#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3478 "SavedSearchDialog.c"
+#line 3324 "SavedSearchDialog.c"
 }
 
 
 static gpointer _search_condition_ref0 (gpointer self) {
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? search_condition_ref (self) : NULL;
-#line 3485 "SavedSearchDialog.c"
+#line 3331 "SavedSearchDialog.c"
 }
 
 
@@ -3496,39 +3342,39 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog
 	GtkEntry* _tmp5_;
 	const gchar* _tmp6_;
 	const gchar* _tmp7_;
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp0_) : NULL);
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp1_;
-#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (text != NULL, "text != null");
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->text_context;
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_text_get_context (text);
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->entry;
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_text_get_text (text);
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_text (_tmp5_, _tmp7_);
-#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed (self);
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (text);
-#line 3532 "SavedSearchDialog.c"
+#line 3378 "SavedSearchDialog.c"
 }
 
 
@@ -3543,53 +3389,53 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc
 	gchar* _tmp5_;
 	gchar* _tmp6_;
 	gboolean _tmp7_;
-#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 213 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = string_chomp (_tmp4_);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _tmp5_;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = g_strcmp0 (_tmp6_, "") != 0;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp6_);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp7_) {
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = TRUE;
-#line 3567 "SavedSearchDialog.c"
+#line 3413 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp8_;
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
-#line 3574 "SavedSearchDialog.c"
+#line 3420 "SavedSearchDialog.c"
 	}
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3580 "SavedSearchDialog.c"
+#line 3426 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp9_;
-#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp9_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3587 "SavedSearchDialog.c"
+#line 3433 "SavedSearchDialog.c"
 	}
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp0_;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3593 "SavedSearchDialog.c"
+#line 3439 "SavedSearchDialog.c"
 }
 
 
@@ -3597,17 +3443,17 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c
 	SearchConditionTextContext result = 0;
 	GtkComboBoxText* _tmp0_;
 	gint _tmp1_;
-#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0);
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->text_context;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = (SearchConditionTextContext) _tmp1_;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3611 "SavedSearchDialog.c"
+#line 3457 "SavedSearchDialog.c"
 }
 
 
@@ -3616,73 +3462,73 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea
 	SearchConditionTextContext _tmp1_;
 	SavedSearchDialogSearchRowContainer* _tmp5_;
 	SavedSearchDialogSearchRowContainer* _tmp6_;
-#line 218 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self));
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) {
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3628 "SavedSearchDialog.c"
+#line 3474 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp2_;
-#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3635 "SavedSearchDialog.c"
+#line 3481 "SavedSearchDialog.c"
 	}
-#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 3639 "SavedSearchDialog.c"
+#line 3485 "SavedSearchDialog.c"
 		GtkEntry* _tmp3_;
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->entry;
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 3645 "SavedSearchDialog.c"
+#line 3491 "SavedSearchDialog.c"
 	} else {
 		GtkEntry* _tmp4_;
-#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->entry;
-#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 3652 "SavedSearchDialog.c"
+#line 3498 "SavedSearchDialog.c"
 	}
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->parent;
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->parent;
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp5_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp6_);
-#line 3660 "SavedSearchDialog.c"
+#line 3506 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass) {
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_parent_class = g_type_class_peek_parent (klass);
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_text_finalize;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowTextPrivate));
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_widget;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_get_search_condition;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete;
-#line 3679 "SavedSearchDialog.c"
+#line 3525 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) {
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self);
-#line 3686 "SavedSearchDialog.c"
+#line 3532 "SavedSearchDialog.c"
 }
 
 
@@ -3692,31 +3538,31 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc
 	guint _tmp1_;
 	GtkEntry* _tmp2_;
 	guint _tmp3_;
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->text_context;
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
-#line 151 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->text_context);
-#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 160 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj);
-#line 3720 "SavedSearchDialog.c"
+#line 3566 "SavedSearchDialog.c"
 }
 
 
@@ -3733,9 +3579,9 @@ static GType saved_search_dialog_search_row_text_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self);
-#line 3739 "SavedSearchDialog.c"
+#line 3585 "SavedSearchDialog.c"
 }
 
 
@@ -3760,104 +3606,104 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media
 	GtkBox* _tmp16_;
 	GtkComboBoxText* _tmp17_;
 	GtkBox* _tmp18_;
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowMediaType*) saved_search_dialog_search_row_construct (object_type);
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_context);
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->media_context = _tmp2_;
-#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->media_context;
-#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("is"));
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->media_context;
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("is not"));
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->media_context;
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->media_context;
-#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp7_);
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->media_type = _tmp7_;
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->media_type;
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp8_, _ ("any photo"));
-#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->media_type;
-#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo"));
-#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->media_type;
-#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp10_, _ ("a video"));
-#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->media_type;
-#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->media_type;
-#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp13_);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp13_;
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->box;
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->media_context;
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->box;
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->media_type;
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->box;
-#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3854 "SavedSearchDialog.c"
+#line 3700 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent);
-#line 3861 "SavedSearchDialog.c"
+#line 3707 "SavedSearchDialog.c"
 }
 
 
@@ -3866,17 +3712,17 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 266 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3880 "SavedSearchDialog.c"
+#line 3726 "SavedSearchDialog.c"
 }
 
 
@@ -3894,35 +3740,35 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc
 	gint _tmp5_;
 	SearchConditionMediaType* c = NULL;
 	SearchConditionMediaType* _tmp6_;
-#line 270 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_context;
-#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = (SearchConditionMediaTypeContext) _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->media_type;
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	type = (SearchConditionMediaTypeMediaType) _tmp5_;
-#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_media_type_new (search_type, context, type);
-#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3926 "SavedSearchDialog.c"
+#line 3772 "SavedSearchDialog.c"
 }
 
 
@@ -3937,91 +3783,91 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch
 	GtkComboBoxText* _tmp5_;
 	SearchConditionMediaTypeMediaType _tmp6_;
 	SearchConditionMediaTypeMediaType _tmp7_;
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp0_) : NULL);
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	media = _tmp1_;
-#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (media != NULL, "media != null");
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_context;
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_media_type_get_context (media);
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->media_type;
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_media_type_get_media_type (media);
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (media);
-#line 3971 "SavedSearchDialog.c"
+#line 3817 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowMediaType * self;
 	gboolean result = FALSE;
-#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3984 "SavedSearchDialog.c"
+#line 3830 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MEDIA_TYPE (self));
-#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 3999 "SavedSearchDialog.c"
+#line 3845 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass) {
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_parent_class = g_type_class_peek_parent (klass);
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_media_type_finalize;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowMediaTypePrivate));
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_widget;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_get_search_condition;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete;
-#line 4018 "SavedSearchDialog.c"
+#line 3864 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) {
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self);
-#line 4025 "SavedSearchDialog.c"
+#line 3871 "SavedSearchDialog.c"
 }
 
 
@@ -4031,31 +3877,31 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo
 	guint _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	guint _tmp3_;
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->media_context;
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_type;
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 232 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_context);
-#line 233 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
-#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 240 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj);
-#line 4059 "SavedSearchDialog.c"
+#line 3905 "SavedSearchDialog.c"
 }
 
 
@@ -4072,9 +3918,9 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self);
-#line 4078 "SavedSearchDialog.c"
+#line 3924 "SavedSearchDialog.c"
 }
 
 
@@ -4099,104 +3945,104 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi
 	GtkBox* _tmp16_;
 	GtkComboBoxText* _tmp17_;
 	GtkBox* _tmp18_;
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowModified*) saved_search_dialog_search_row_construct (object_type);
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_context);
-#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->modified_context = _tmp2_;
-#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->modified_context;
-#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("has"));
-#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->modified_context;
-#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("has no"));
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->modified_context;
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->modified_context;
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp7_);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->modified_state = _tmp7_;
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->modified_state;
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp8_, _ ("modifications"));
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->modified_state;
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications"));
-#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->modified_state;
-#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications"));
-#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->modified_state;
-#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->modified_state;
-#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp13_);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp13_;
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->box;
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->modified_context;
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->box;
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->modified_state;
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->box;
-#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4193 "SavedSearchDialog.c"
+#line 4039 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent);
-#line 4200 "SavedSearchDialog.c"
+#line 4046 "SavedSearchDialog.c"
 }
 
 
@@ -4205,17 +4051,17 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 328 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4219 "SavedSearchDialog.c"
+#line 4065 "SavedSearchDialog.c"
 }
 
 
@@ -4233,35 +4079,35 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_
 	gint _tmp5_;
 	SearchConditionModified* c = NULL;
 	SearchConditionModified* _tmp6_;
-#line 332 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_context;
-#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = (SearchConditionModifiedContext) _tmp3_;
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->modified_state;
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	state = (SearchConditionModifiedState) _tmp5_;
-#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_modified_new (search_type, context, state);
-#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4265 "SavedSearchDialog.c"
+#line 4111 "SavedSearchDialog.c"
 }
 
 
@@ -4276,91 +4122,91 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi
 	GtkComboBoxText* _tmp5_;
 	SearchConditionModifiedContext _tmp6_;
 	SearchConditionModifiedContext _tmp7_;
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp0_) : NULL);
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	scm = _tmp1_;
-#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (scm != NULL, "scm != null");
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_state;
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_modified_get_state (scm);
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->modified_context;
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_modified_get_context (scm);
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (scm);
-#line 4310 "SavedSearchDialog.c"
+#line 4156 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowModified * self;
 	gboolean result = FALSE;
-#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4323 "SavedSearchDialog.c"
+#line 4169 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 351 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MODIFIED (self));
-#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 4338 "SavedSearchDialog.c"
+#line 4184 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass) {
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_parent_class = g_type_class_peek_parent (klass);
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_modified_finalize;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowModifiedPrivate));
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_widget;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_get_search_condition;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete;
-#line 4357 "SavedSearchDialog.c"
+#line 4203 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) {
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self);
-#line 4364 "SavedSearchDialog.c"
+#line 4210 "SavedSearchDialog.c"
 }
 
 
@@ -4370,31 +4216,31 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS
 	guint _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	guint _tmp3_;
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->modified_state;
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_context;
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 296 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_context);
-#line 297 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
-#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj);
-#line 4398 "SavedSearchDialog.c"
+#line 4244 "SavedSearchDialog.c"
 }
 
 
@@ -4411,9 +4257,9 @@ static GType saved_search_dialog_search_row_modified_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self);
-#line 4417 "SavedSearchDialog.c"
+#line 4263 "SavedSearchDialog.c"
 }
 
 
@@ -4433,82 +4279,82 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged
 	GtkBox* _tmp11_;
 	GtkComboBoxText* _tmp12_;
 	GtkBox* _tmp13_;
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowFlagged*) saved_search_dialog_search_row_construct (object_type);
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->flagged_state);
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->flagged_state = _tmp2_;
-#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->flagged_state;
-#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("flagged"));
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->flagged_state;
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged"));
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->flagged_state;
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->flagged_state;
-#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp7_);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp7_;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->box;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkLabel*) gtk_label_new (_ ("is"));
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = _tmp9_;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp10_);
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->box;
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->flagged_state;
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->box;
-#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4505 "SavedSearchDialog.c"
+#line 4351 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent);
-#line 4512 "SavedSearchDialog.c"
+#line 4358 "SavedSearchDialog.c"
 }
 
 
@@ -4517,17 +4363,17 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 382 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4531 "SavedSearchDialog.c"
+#line 4377 "SavedSearchDialog.c"
 }
 
 
@@ -4542,29 +4388,29 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c
 	gint _tmp3_;
 	SearchConditionFlagged* c = NULL;
 	SearchConditionFlagged* _tmp4_;
-#line 386 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 391 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->flagged_state;
-#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	state = (SearchConditionFlaggedState) _tmp3_;
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = search_condition_flagged_new (search_type, state);
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp4_;
-#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4568 "SavedSearchDialog.c"
+#line 4414 "SavedSearchDialog.c"
 }
 
 
@@ -4576,83 +4422,83 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia
 	GtkComboBoxText* _tmp2_;
 	SearchConditionFlaggedState _tmp3_;
 	SearchConditionFlaggedState _tmp4_;
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp0_) : NULL);
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	f = _tmp1_;
-#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (f != NULL, "f != null");
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->flagged_state;
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_flagged_get_state (f);
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (f);
-#line 4602 "SavedSearchDialog.c"
+#line 4448 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowFlagged * self;
 	gboolean result = FALSE;
-#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4615 "SavedSearchDialog.c"
+#line 4461 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 403 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_FLAGGED (self));
-#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 4630 "SavedSearchDialog.c"
+#line 4476 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass) {
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_parent_class = g_type_class_peek_parent (klass);
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_flagged_finalize;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowFlaggedPrivate));
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_widget;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_get_search_condition;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete;
-#line 4649 "SavedSearchDialog.c"
+#line 4495 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) {
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self);
-#line 4656 "SavedSearchDialog.c"
+#line 4502 "SavedSearchDialog.c"
 }
 
 
@@ -4660,23 +4506,23 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe
 	SavedSearchDialogSearchRowFlagged * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->flagged_state;
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
-#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 358 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->flagged_state);
-#line 360 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 365 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj);
-#line 4680 "SavedSearchDialog.c"
+#line 4526 "SavedSearchDialog.c"
 }
 
 
@@ -4693,9 +4539,9 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self);
-#line 4699 "SavedSearchDialog.c"
+#line 4545 "SavedSearchDialog.c"
 }
 
 
@@ -4735,150 +4581,150 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c
 	GtkBox* _tmp31_;
 	GtkComboBoxText* _tmp32_;
 	GtkBox* _tmp33_;
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowRating*) saved_search_dialog_search_row_construct (object_type);
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->rating);
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->rating = _tmp2_;
-#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->rating;
-#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = resources_rating_combo_box (RATING_REJECTED);
-#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->rating;
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = resources_rating_combo_box (RATING_UNRATED);
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->rating;
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = resources_rating_combo_box (RATING_ONE);
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
-#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->rating;
-#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = resources_rating_combo_box (RATING_TWO);
-#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
-#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->rating;
-#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = resources_rating_combo_box (RATING_THREE);
-#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->rating;
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = resources_rating_combo_box (RATING_FOUR);
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp13_, _tmp14_);
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->rating;
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = resources_rating_combo_box (RATING_FIVE);
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp15_, _tmp16_);
-#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->rating;
-#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->rating;
-#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->context = _tmp19_;
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->context;
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp20_, _ ("and higher"));
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->context;
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp21_, _ ("only"));
-#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->context;
-#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp22_, _ ("and lower"));
-#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = self->priv->context;
-#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->context;
-#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp25_);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp25_;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = self->priv->box;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp27_ = (GtkLabel*) gtk_label_new (_ ("is"));
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp27_);
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp28_ = _tmp27_;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp28_);
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp29_ = self->priv->box;
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = self->priv->rating;
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp31_ = self->priv->box;
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp32_ = self->priv->context;
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp33_ = self->priv->box;
-#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4875 "SavedSearchDialog.c"
+#line 4721 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent);
-#line 4882 "SavedSearchDialog.c"
+#line 4728 "SavedSearchDialog.c"
 }
 
 
@@ -4887,17 +4733,17 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 449 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4901 "SavedSearchDialog.c"
+#line 4747 "SavedSearchDialog.c"
 }
 
 
@@ -4915,35 +4761,35 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co
 	gint _tmp5_;
 	SearchConditionRating* c = NULL;
 	SearchConditionRating* _tmp6_;
-#line 453 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->rating;
-#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_rating = ((Rating) _tmp3_) + RATING_REJECTED;
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->context;
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_context = (SearchConditionRatingContext) _tmp5_;
-#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_rating_new (search_type, search_rating, search_context);
-#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4947 "SavedSearchDialog.c"
+#line 4793 "SavedSearchDialog.c"
 }
 
 
@@ -4958,91 +4804,91 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial
 	GtkComboBoxText* _tmp5_;
 	Rating _tmp6_;
 	Rating _tmp7_;
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp0_) : NULL);
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	r = _tmp1_;
-#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (r != NULL, "r != null");
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_rating_get_context (r);
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->rating;
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_rating_get_rating (r);
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED));
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (r);
-#line 4992 "SavedSearchDialog.c"
+#line 4838 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowRating * self;
 	gboolean result = FALSE;
-#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5005 "SavedSearchDialog.c"
+#line 4851 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 472 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_RATING (self));
-#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 5020 "SavedSearchDialog.c"
+#line 4866 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass) {
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_parent_class = g_type_class_peek_parent (klass);
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_rating_finalize;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowRatingPrivate));
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_widget;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_get_search_condition;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete;
-#line 5039 "SavedSearchDialog.c"
+#line 4885 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) {
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self);
-#line 5046 "SavedSearchDialog.c"
+#line 4892 "SavedSearchDialog.c"
 }
 
 
@@ -5052,31 +4898,31 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea
 	guint _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	guint _tmp3_;
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->rating;
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 410 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->rating);
-#line 411 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 418 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj);
-#line 5080 "SavedSearchDialog.c"
+#line 4926 "SavedSearchDialog.c"
 }
 
 
@@ -5093,23 +4939,23 @@ static GType saved_search_dialog_search_row_rating_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self);
-#line 5099 "SavedSearchDialog.c"
+#line 4945 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5106 "SavedSearchDialog.c"
+#line 4952 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5113 "SavedSearchDialog.c"
+#line 4959 "SavedSearchDialog.c"
 }
 
 
@@ -5142,150 +4988,150 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const
 	GtkBox* _tmp24_;
 	GtkButton* _tmp25_;
 	GtkBox* _tmp26_;
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowDate*) saved_search_dialog_search_row_construct (object_type);
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->context = _tmp2_;
-#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->context;
-#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly"));
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->context;
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _ ("is after"));
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->context;
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _ ("is before"));
-#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->context;
-#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp6_, _ ("is between"));
-#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->context;
-#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _ ("is not set"));
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->context;
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->context;
-#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = (GtkCalendar*) gtk_calendar_new ();
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp10_);
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->cal_one = _tmp10_;
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = (GtkCalendar*) gtk_calendar_new ();
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp11_);
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->cal_two = _tmp11_;
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = (GtkButton*) gtk_button_new ();
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp12_);
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->label_one = _tmp12_;
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->label_one;
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp13_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self);
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = (GtkButton*) gtk_button_new ();
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp14_);
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
-#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->label_two = _tmp14_;
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->label_two;
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp15_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self);
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = (GtkLabel*) gtk_label_new (_ ("and"));
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp16_);
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
-#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->and = _tmp16_;
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp17_);
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp17_;
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->box;
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = self->priv->context;
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->box;
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->label_one;
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->box;
-#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = self->priv->and;
-#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->box;
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = self->priv->label_two;
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = self->priv->box;
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 524 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 5282 "SavedSearchDialog.c"
+#line 5128 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent);
-#line 5289 "SavedSearchDialog.c"
+#line 5135 "SavedSearchDialog.c"
 }
 
 
@@ -5304,110 +5150,110 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 	GDateTime* _tmp20_;
 	gchar* _tmp21_;
 	gchar* _tmp22_;
-#line 526 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->context;
-#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = (SearchConditionDateContext) _tmp1_;
-#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = c;
-#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
-#line 5320 "SavedSearchDialog.c"
+#line 5166 "SavedSearchDialog.c"
 		GtkButton* _tmp3_;
 		GtkLabel* _tmp4_;
 		GtkButton* _tmp5_;
-#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->label_one;
-#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->and;
-#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = self->priv->label_two;
-#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 5336 "SavedSearchDialog.c"
+#line 5182 "SavedSearchDialog.c"
 	} else {
 		SearchConditionDateContext _tmp6_;
-#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = c;
-#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) {
-#line 5343 "SavedSearchDialog.c"
+#line 5189 "SavedSearchDialog.c"
 			GtkButton* _tmp7_;
 			GtkLabel* _tmp8_;
 			GtkButton* _tmp9_;
-#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = self->priv->label_one;
-#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp8_ = self->priv->and;
-#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = self->priv->label_two;
-#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 5359 "SavedSearchDialog.c"
+#line 5205 "SavedSearchDialog.c"
 		} else {
 			GtkButton* _tmp10_;
 			GtkLabel* _tmp11_;
 			GtkButton* _tmp12_;
-#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = self->priv->label_one;
-#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp11_ = self->priv->and;
-#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp12_ = self->priv->label_two;
-#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 5376 "SavedSearchDialog.c"
+#line 5222 "SavedSearchDialog.c"
 		}
 	}
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->label_one;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_dialog_search_row_date_get_date_one (self);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = g_date_time_format (_tmp15_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = _tmp16_;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_button_set_label (_tmp13_, _tmp17_);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp17_);
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp15_);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->label_two;
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = saved_search_dialog_search_row_date_get_date_two (self);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = _tmp19_;
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = g_date_time_format (_tmp20_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = _tmp21_;
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_button_set_label (_tmp18_, _tmp22_);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp22_);
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp20_);
-#line 5411 "SavedSearchDialog.c"
+#line 5257 "SavedSearchDialog.c"
 }
 
 
@@ -5416,17 +5262,17 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
-#line 549 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5430 "SavedSearchDialog.c"
+#line 5276 "SavedSearchDialog.c"
 }
 
 
@@ -5442,33 +5288,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD
 	gint _tmp7_;
 	gint _tmp8_;
 	GDateTime* _tmp9_;
-#line 553 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "year", &_tmp1_, NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_one;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_one;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "day", &_tmp7_, NULL);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0);
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp9_;
-#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5472 "SavedSearchDialog.c"
+#line 5318 "SavedSearchDialog.c"
 }
 
 
@@ -5484,33 +5330,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD
 	gint _tmp7_;
 	gint _tmp8_;
 	GDateTime* _tmp9_;
-#line 557 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "year", &_tmp1_, NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_two;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_two;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "day", &_tmp7_, NULL);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0);
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp9_;
-#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5514 "SavedSearchDialog.c"
+#line 5360 "SavedSearchDialog.c"
 }
 
 
@@ -5524,35 +5370,35 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS
 	GtkCalendar* _tmp6_;
 	GDateTime* _tmp7_;
 	gint _tmp8_;
-#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (date != NULL);
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = date;
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_one;
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = date;
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_one;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = date;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5556 "SavedSearchDialog.c"
+#line 5402 "SavedSearchDialog.c"
 }
 
 
@@ -5566,35 +5412,35 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS
 	GtkCalendar* _tmp6_;
 	GDateTime* _tmp7_;
 	gint _tmp8_;
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (date != NULL);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = date;
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_two;
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = date;
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_two;
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = date;
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5598 "SavedSearchDialog.c"
+#line 5444 "SavedSearchDialog.c"
 }
 
 
@@ -5614,43 +5460,43 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond
 	GDateTime* _tmp7_;
 	SearchConditionDate* _tmp8_;
 	SearchConditionDate* _tmp9_;
-#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_context = (SearchConditionDateContext) _tmp3_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = saved_search_dialog_search_row_date_get_date_one (self);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = saved_search_dialog_search_row_date_get_date_two (self);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = search_condition_date_new (search_type, search_context, _tmp5_, _tmp7_);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp7_);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp5_);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp9_;
-#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5654 "SavedSearchDialog.c"
+#line 5500 "SavedSearchDialog.c"
 }
 
 
@@ -5666,136 +5512,136 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog
 	GDateTime* _tmp6_;
 	GDateTime* _tmp7_;
 	GDateTime* _tmp8_;
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp0_) : NULL);
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	cond = _tmp1_;
-#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (cond != NULL, "cond != null");
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_date_get_context (cond);
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = search_condition_date_get_date_one (cond);
-#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _tmp5_;
-#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_set_date_one (self, _tmp6_);
-#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = search_condition_date_get_date_two (cond);
-#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_set_date_two (self, _tmp8_);
-#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (cond);
-#line 5706 "SavedSearchDialog.c"
+#line 5552 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowDate * self;
 	gboolean result = FALSE;
-#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5719 "SavedSearchDialog.c"
+#line 5565 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
-#line 594 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5736 "SavedSearchDialog.c"
+#line 5582 "SavedSearchDialog.c"
 }
 
 
 static Block10Data* block10_data_ref (Block10Data* _data10_) {
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&_data10_->_ref_count_);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _data10_;
-#line 5745 "SavedSearchDialog.c"
+#line 5591 "SavedSearchDialog.c"
 }
 
 
 static void block10_data_unref (void * _userdata_) {
 	Block10Data* _data10_;
 	_data10_ = (Block10Data*) _userdata_;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) {
-#line 5754 "SavedSearchDialog.c"
+#line 5600 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowDate* self;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self = _data10_->self;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_data10_->d);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_unref0 (self);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_slice_free (Block10Data, _data10_);
-#line 5764 "SavedSearchDialog.c"
+#line 5610 "SavedSearchDialog.c"
 	}
 }
 
 
-static void __lambda13_ (SavedSearchDialogSearchRowDate* self) {
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+static void __lambda14_ (SavedSearchDialogSearchRowDate* self) {
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5772 "SavedSearchDialog.c"
+#line 5618 "SavedSearchDialog.c"
 }
 
 
-static void ___lambda13__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	__lambda13_ ((SavedSearchDialogSearchRowDate*) self);
-#line 5779 "SavedSearchDialog.c"
+static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	__lambda14_ ((SavedSearchDialogSearchRowDate*) self);
+#line 5625 "SavedSearchDialog.c"
 }
 
 
-static void __lambda14_ (Block10Data* _data10_) {
+static void __lambda15_ (Block10Data* _data10_) {
 	SavedSearchDialogSearchRowDate* self;
 	GtkDialog* _tmp0_;
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = _data10_->self;
-#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = _data10_->d;
-#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
-#line 5792 "SavedSearchDialog.c"
+#line 5638 "SavedSearchDialog.c"
 }
 
 
-static void ___lambda14__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	__lambda14_ (self);
-#line 5799 "SavedSearchDialog.c"
+static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	__lambda15_ (self);
+#line 5645 "SavedSearchDialog.c"
 }
 
 
@@ -5836,192 +5682,192 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	GtkCalendar* _tmp32_;
 	gulong _tmp33_;
 	GtkDialog* _tmp34_;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (GTK_IS_CALENDAR (cal));
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_ = g_slice_new0 (Block10Data);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_->_ref_count_ = 1;
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_->self = saved_search_dialog_search_row_ref (self);
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = cal;
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "day", &_tmp1_, NULL);
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_day = _tmp2_;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = cal;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_month = _tmp5_;
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = cal;
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "year", &_tmp7_, NULL);
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_year = _tmp8_;
-#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL);
-#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_->d = _tmp9_;
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = _data10_->d;
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = _data10_->d;
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _data10_->d;
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = _data10_->d;
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_);
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = cal;
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = cal;
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda13__gtk_calendar_day_selected, self);
-#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda14__gtk_calendar_day_selected, self);
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	id_1 = _tmp17_;
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = cal;
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda14__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
-#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda15__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	id_2 = _tmp19_;
-#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = _data10_->d;
-#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = _data10_->d;
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = gtk_dialog_run (_tmp21_);
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	res = _tmp22_;
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = res;
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 5926 "SavedSearchDialog.c"
+#line 5772 "SavedSearchDialog.c"
 		GtkCalendar* _tmp24_;
 		gint _tmp25_;
 		GtkCalendar* _tmp26_;
 		gint _tmp27_;
 		GtkCalendar* _tmp28_;
 		gint _tmp29_;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp24_ = cal;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp25_ = orig_day;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp24_, "day", _tmp25_, NULL);
-#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp26_ = cal;
-#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp27_ = orig_month;
-#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp26_, "month", _tmp27_, NULL);
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp28_ = cal;
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp29_ = orig_year;
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp28_, "year", _tmp29_, NULL);
-#line 5951 "SavedSearchDialog.c"
+#line 5797 "SavedSearchDialog.c"
 	}
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = cal;
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp31_ = id_1;
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, G_TYPE_OBJECT, GObject), _tmp31_);
-#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp32_ = cal;
-#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp33_ = id_2;
-#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_);
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp34_ = _data10_->d;
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 630 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	block10_data_unref (_data10_);
-#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_ = NULL;
-#line 5975 "SavedSearchDialog.c"
+#line 5821 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) {
 	GtkCalendar* _tmp0_;
-#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 5987 "SavedSearchDialog.c"
+#line 5833 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) {
 	GtkCalendar* _tmp0_;
-#line 632 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 5999 "SavedSearchDialog.c"
+#line 5845 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass) {
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_parent_class = g_type_class_peek_parent (klass);
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_date_finalize;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowDatePrivate));
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = (GtkWidget* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_widget;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = (SearchCondition* (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_get_search_condition;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete;
-#line 6018 "SavedSearchDialog.c"
+#line 5864 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) {
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self);
-#line 6025 "SavedSearchDialog.c"
+#line 5871 "SavedSearchDialog.c"
 }
 
 
@@ -6029,33 +5875,33 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc
 	SavedSearchDialogSearchRowDate * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->context;
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
-#line 479 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 484 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 480 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 481 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 486 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
-#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 488 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
-#line 484 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
-#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
-#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 492 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj);
-#line 6059 "SavedSearchDialog.c"
+#line 5905 "SavedSearchDialog.c"
 }
 
 
@@ -6071,288 +5917,82 @@ static GType saved_search_dialog_search_row_date_get_type (void) {
 }
 
 
-static void value_saved_search_dialog_init (GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	value->data[0].v_pointer = NULL;
-#line 6078 "SavedSearchDialog.c"
-}
-
-
-static void value_saved_search_dialog_free_value (GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (value->data[0].v_pointer) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_unref (value->data[0].v_pointer);
-#line 6087 "SavedSearchDialog.c"
-	}
-}
-
-
-static void value_saved_search_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (src_value->data[0].v_pointer) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		dest_value->data[0].v_pointer = saved_search_dialog_ref (src_value->data[0].v_pointer);
-#line 6097 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 6101 "SavedSearchDialog.c"
-	}
-}
-
-
-static gpointer value_saved_search_dialog_peek_pointer (const GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return value->data[0].v_pointer;
-#line 6109 "SavedSearchDialog.c"
-}
-
-
-static gchar* value_saved_search_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (collect_values[0].v_pointer) {
-#line 6116 "SavedSearchDialog.c"
-		SavedSearchDialog * object;
-		object = collect_values[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6123 "SavedSearchDialog.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6127 "SavedSearchDialog.c"
-		}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = saved_search_dialog_ref (object);
-#line 6131 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = NULL;
-#line 6135 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return NULL;
-#line 6139 "SavedSearchDialog.c"
-}
-
-
-static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	SavedSearchDialog ** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (!object_p) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6150 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (!value->data[0].v_pointer) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		*object_p = NULL;
-#line 6156 "SavedSearchDialog.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		*object_p = value->data[0].v_pointer;
-#line 6160 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		*object_p = saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6164 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return NULL;
-#line 6168 "SavedSearchDialog.c"
-}
-
-
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecSavedSearchDialog* spec;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_DIALOG), NULL);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return G_PARAM_SPEC (spec);
-#line 6182 "SavedSearchDialog.c"
-}
-
-
-gpointer value_get_saved_search_dialog (const GValue* value) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG), NULL);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return value->data[0].v_pointer;
-#line 6191 "SavedSearchDialog.c"
-}
-
-
-void value_set_saved_search_dialog (GValue* value, gpointer v_object) {
-	SavedSearchDialog * old;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	old = value->data[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (v_object) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = v_object;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6211 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = NULL;
-#line 6215 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (old) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_unref (old);
-#line 6221 "SavedSearchDialog.c"
-	}
-}
-
-
-void value_take_saved_search_dialog (GValue* value, gpointer v_object) {
-	SavedSearchDialog * old;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	old = value->data[0].v_pointer;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (v_object) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SAVED_SEARCH_DIALOG));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = v_object;
-#line 6240 "SavedSearchDialog.c"
-	} else {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		value->data[0].v_pointer = NULL;
-#line 6244 "SavedSearchDialog.c"
-	}
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (old) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_unref (old);
-#line 6250 "SavedSearchDialog.c"
-	}
-}
-
-
 static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gint SavedSearchDialog_private_offset;
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate));
-#line 6262 "SavedSearchDialog.c"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	G_OBJECT_CLASS (klass)->finalize = saved_search_dialog_finalize;
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	SavedSearchDialog_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/saved_search_dialog.ui");
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "add_criteria", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, add_criteria));
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "operator", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, operator));
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "search_title", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, search_title));
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "row_listbox", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, row_listbox));
+#line 5941 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 	GeeArrayList* _tmp0_;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self);
-#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, (GDestroyNotify) saved_search_dialog_search_row_container_unref, NULL, NULL, NULL);
-#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->row_list = _tmp0_;
-#line 644 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->edit_mode = FALSE;
-#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->previous_search = NULL;
-#line 646 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 654 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->valid = FALSE;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->ref_count = 1;
-#line 6282 "SavedSearchDialog.c"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 5961 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_finalize (SavedSearchDialog * obj) {
+static void saved_search_dialog_finalize (GObject * obj) {
 	SavedSearchDialog * self;
-	GtkEntry* _tmp0_;
-	guint _tmp1_;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handlers_destroy (self);
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = self->priv->search_title;
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp1_, NULL, FALSE);
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
-#line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->dialog);
-#line 639 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->add_criteria);
-#line 640 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->operator);
-#line 641 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->row_box);
-#line 642 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 647 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_title);
-#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_object_unref0 (self->priv->row_listbox);
+#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->row_list);
-#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 6316 "SavedSearchDialog.c"
+#line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	G_OBJECT_CLASS (saved_search_dialog_parent_class)->finalize (obj);
+#line 5983 "SavedSearchDialog.c"
 }
 
 
 GType saved_search_dialog_get_type (void) {
 	static volatile gsize saved_search_dialog_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_saved_search_dialog_init, value_saved_search_dialog_free_value, value_saved_search_dialog_copy_value, value_saved_search_dialog_peek_pointer, "p", value_saved_search_dialog_collect_value, "p", value_saved_search_dialog_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, NULL };
 		GType saved_search_dialog_type_id;
-		saved_search_dialog_type_id = g_type_register_fundamental (g_type_fundamental_next (), "SavedSearchDialog", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		saved_search_dialog_type_id = g_type_register_static (gtk_dialog_get_type (), "SavedSearchDialog", &g_define_type_info, 0);
 		g_once_init_leave (&saved_search_dialog_type_id__volatile, saved_search_dialog_type_id);
 	}
 	return saved_search_dialog_type_id__volatile;
 }
 
 
-gpointer saved_search_dialog_ref (gpointer instance) {
-	SavedSearchDialog * self;
-	self = instance;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	return instance;
-#line 6341 "SavedSearchDialog.c"
-}
-
-
-void saved_search_dialog_unref (gpointer instance) {
-	SavedSearchDialog * self;
-	self = instance;
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		SAVED_SEARCH_DIALOG_GET_CLASS (self)->finalize (self);
-#line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 6354 "SavedSearchDialog.c"
-	}
-}
-
-
 
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index 5365cde..d31140a 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -5,7 +5,8 @@
  */
 
 // This dialog displays a boolean search configuration.
-public class SavedSearchDialog {
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/saved_search_dialog.ui")]
+public class SavedSearchDialog : Gtk.Dialog {
     
     // Contains a search row, with a type selector and remove button.
     private class SearchRowContainer {
@@ -47,12 +48,17 @@ public class SavedSearchDialog {
             set_type_combo_box(SearchCondition.SearchType.ANY_TEXT); // Sets default.
             type_combo.changed.connect(on_type_changed);
             
-            remove_button = new Gtk.Button.from_icon_name("list-remove-symbolic", Gtk.IconSize.BUTTON);
-            remove_button.button_press_event.connect(on_removed);
+            remove_button = new Gtk.Button.from_icon_name("window-close-symbolic", Gtk.IconSize.BUTTON);
+            remove_button.set_relief(Gtk.ReliefStyle.NONE);
+            remove_button.clicked.connect(on_removed);
             
-            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
+            box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 6);
             box.pack_start(type_combo, false, false, 0);
             box.pack_end(remove_button, false, false, 0);
+            box.margin_top = 2;
+            box.margin_bottom = 2;
+            box.margin_start = 8;
+            box.margin_end = 8;
             box.show_all();
         }
         
@@ -110,9 +116,8 @@ public class SavedSearchDialog {
             return search_types[type_combo.get_active()];
         }
         
-        private bool on_removed(Gdk.EventButton event) {
+        private void on_removed() {
             remove(this);
-            return false;
         }
         
         public void allow_removal(bool allow) {
@@ -634,18 +639,23 @@ public class SavedSearchDialog {
         }
     }
     
-    private Gtk.Builder builder;
-    private Gtk.Dialog dialog;
+    [GtkChild]
     private Gtk.Button add_criteria;
+    [GtkChild]
     private Gtk.ComboBoxText operator;
-    private Gtk.Box row_box;
+    [GtkChild]
     private Gtk.Entry search_title;
+    [GtkChild]
+    private Gtk.ListBox row_listbox;
+
     private Gee.ArrayList<SearchRowContainer> row_list = new Gee.ArrayList<SearchRowContainer>();
     private bool edit_mode = false;
     private SavedSearch? previous_search = null;
     private bool valid = false;
     
     public SavedSearchDialog() {
+        Object (use_header_bar : Resources.use_header_bar());
+
         setup_dialog();
         
         // Default name.
@@ -656,16 +666,18 @@ public class SavedSearchDialog {
         add_text_search();
         row_list.get(0).allow_removal(false);
 
-        dialog.show_all();
+        show_all();
         set_valid(false);
     }
     
     public SavedSearchDialog.edit_existing(SavedSearch saved_search) {
+        Object (use_header_bar : Resources.use_header_bar());
+
         previous_search = saved_search;
         edit_mode = true;
         setup_dialog();
         
-        dialog.show_all();
+        show_all();
         
         // Load existing search into dialog.
         operator.set_active((SearchOperator) saved_search.get_operator());
@@ -680,55 +692,25 @@ public class SavedSearchDialog {
         set_valid(true);
     }
     
-    ~SavedSearchDialog() {
-        search_title.changed.disconnect(on_title_changed);
-    }
-    
     // Builds the dialog UI.  Doesn't add buttons to the dialog or call dialog.show().
     private void setup_dialog() {
-        builder = AppWindow.create_builder();
-
-        dialog = new Gtk.Dialog.with_buttons(_("Search"),
-                                         (Gtk.Window) AppWindow.get_instance().get_parent_window(),
-                                         Gtk.DialogFlags.MODAL |
-                                         Gtk.DialogFlags.DESTROY_WITH_PARENT |
-                                         Gtk.DialogFlags.USE_HEADER_BAR,
-                                         _("Cancel"), Gtk.ResponseType.CANCEL,
-                                         _("OK"), Gtk.ResponseType.OK,
-                                         null);
-        dialog.set_resizable(false);
-        dialog.set_transient_for(AppWindow.get_instance());
-        dialog.set_default_response(Gtk.ResponseType.OK);
-        dialog.response.connect(on_response);
-        dialog.get_content_area().add(builder.get_object("criteria") as Gtk.Widget);
-        dialog.set_default_response (Gtk.ResponseType.OK);
+        set_transient_for(AppWindow.get_instance());
+        response.connect(on_response);
 
-        add_criteria = builder.get_object("Add search button") as Gtk.Button;
-        add_criteria.button_press_event.connect(on_add_criteria);
+        add_criteria.clicked.connect(on_add_criteria);
         
-        search_title = builder.get_object("Search title") as Gtk.Entry;
-        search_title.set_activates_default(true);
         search_title.changed.connect(on_title_changed);
-        
-        row_box = builder.get_object("row_box") as Gtk.Box;
-        
-        operator = builder.get_object("Type of search criteria") as Gtk.ComboBoxText;
-        operator.append_text(_("any"));
-        operator.append_text(_("all"));
-        operator.append_text(_("none"));
-        operator.set_active(0);
     }
     
     // Displays the dialog.
-    public void show() {
-        dialog.run();
-        dialog.destroy();
+    public new void show() {
+        run();
+        destroy();
     }
     
     // Adds a row of search criteria.
-    private bool on_add_criteria(Gdk.EventButton event) {
+    private void on_add_criteria() {
         add_text_search();
-        return false;
     }
     
     private void add_text_search() {
@@ -740,7 +722,7 @@ public class SavedSearchDialog {
     private void add_row(SearchRowContainer row) {
         if (row_list.size == 1)
             row_list.get(0).allow_removal(true);
-        row_box.add(row.get_widget());
+        row_listbox.add(row.get_widget());
         row_list.add(row);
         row.remove.connect(on_remove_row);
         row.changed.connect(on_row_changed);
@@ -751,7 +733,7 @@ public class SavedSearchDialog {
     private void on_remove_row(SearchRowContainer row) {
         row.remove.disconnect(on_remove_row);
         row.changed.disconnect(on_row_changed);
-        row_box.remove(row.get_widget());
+        row_listbox.remove(row.get_widget().get_parent());
         row_list.remove(row);
         if (row_list.size == 1)
             row_list.get(0).allow_removal(false);
@@ -820,6 +802,6 @@ public class SavedSearchDialog {
             }
         }
         
-        dialog.set_response_sensitive(Gtk.ResponseType.OK, valid);
+        set_response_sensitive(Gtk.ResponseType.OK, valid);
     }
 }
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 92f433b..57c205f 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -451,7 +451,6 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
 
 typedef struct _SavedSearchDialog SavedSearchDialog;
 typedef struct _SavedSearchDialogClass SavedSearchDialogClass;
-#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL)))
 
 struct _ViewManager {
 	GTypeInstance parent_instance;
@@ -808,12 +807,6 @@ 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);
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
 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);
@@ -828,7 +821,7 @@ static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _save
 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 832 "SavedSearchPage.c"
+#line 825 "SavedSearchPage.c"
 }
 
 
@@ -855,14 +848,14 @@ SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSear
 	self->priv->search = _tmp2_;
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self;
-#line 859 "SavedSearchPage.c"
+#line 852 "SavedSearchPage.c"
 }
 
 
 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 866 "SavedSearchPage.c"
+#line 859 "SavedSearchPage.c"
 }
 
 
@@ -886,7 +879,7 @@ static gboolean saved_search_manager_real_include_in_view (ViewManager* base, Da
 	result = _tmp2_;
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return result;
-#line 890 "SavedSearchPage.c"
+#line 883 "SavedSearchPage.c"
 }
 
 
@@ -899,14 +892,14 @@ 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 903 "SavedSearchPage.c"
+#line 896 "SavedSearchPage.c"
 }
 
 
 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 910 "SavedSearchPage.c"
+#line 903 "SavedSearchPage.c"
 }
 
 
@@ -918,7 +911,7 @@ 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 922 "SavedSearchPage.c"
+#line 915 "SavedSearchPage.c"
 }
 
 
@@ -937,21 +930,21 @@ 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) {
 #line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_page_on_rename_search ((SavedSearchPage*) self);
-#line 941 "SavedSearchPage.c"
+#line 934 "SavedSearchPage.c"
 }
 
 
 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 948 "SavedSearchPage.c"
+#line 941 "SavedSearchPage.c"
 }
 
 
 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 955 "SavedSearchPage.c"
+#line 948 "SavedSearchPage.c"
 }
 
 
@@ -982,7 +975,7 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 	_g_object_unref0 (self->priv->search);
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self->priv->search = _tmp4_;
-#line 986 "SavedSearchPage.c"
+#line 979 "SavedSearchPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp5_;
@@ -1011,7 +1004,7 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 		_sources_it = _tmp10_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		while (TRUE) {
-#line 1015 "SavedSearchPage.c"
+#line 1008 "SavedSearchPage.c"
 			GeeIterator* _tmp11_;
 			gboolean _tmp12_;
 			MediaSourceCollection* sources = NULL;
@@ -1033,7 +1026,7 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 			if (!_tmp12_) {
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 				break;
-#line 1037 "SavedSearchPage.c"
+#line 1030 "SavedSearchPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_tmp13_ = _sources_it;
@@ -1065,24 +1058,24 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 			_data_collection_unref0 (_tmp16_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_data_collection_unref0 (sources);
-#line 1069 "SavedSearchPage.c"
+#line 1062 "SavedSearchPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 1073 "SavedSearchPage.c"
+#line 1066 "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 1079 "SavedSearchPage.c"
+#line 1072 "SavedSearchPage.c"
 }
 
 
 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 1086 "SavedSearchPage.c"
+#line 1079 "SavedSearchPage.c"
 }
 
 
@@ -1112,13 +1105,13 @@ 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 1116 "SavedSearchPage.c"
+#line 1109 "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 1122 "SavedSearchPage.c"
+#line 1115 "SavedSearchPage.c"
 	}
 }
 
@@ -1143,7 +1136,7 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1147 "SavedSearchPage.c"
+#line 1140 "SavedSearchPage.c"
 }
 
 
@@ -1163,7 +1156,7 @@ static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp1_ = 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 1167 "SavedSearchPage.c"
+#line 1160 "SavedSearchPage.c"
 }
 
 
@@ -1183,7 +1176,7 @@ static void saved_search_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = 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 1187 "SavedSearchPage.c"
+#line 1180 "SavedSearchPage.c"
 }
 
 
@@ -1198,7 +1191,7 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 	_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 1202 "SavedSearchPage.c"
+#line 1195 "SavedSearchPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1210,11 +1203,11 @@ 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 1214 "SavedSearchPage.c"
+#line 1207 "SavedSearchPage.c"
 			GActionEntry entry = {0};
 #line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			entry = entry_collection[entry_it];
-#line 1218 "SavedSearchPage.c"
+#line 1211 "SavedSearchPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -1227,7 +1220,7 @@ static void saved_search_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1231 "SavedSearchPage.c"
+#line 1224 "SavedSearchPage.c"
 			}
 		}
 	}
@@ -1245,7 +1238,7 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (_tmp1_) {
-#line 1249 "SavedSearchPage.c"
+#line 1242 "SavedSearchPage.c"
 		CommandManager* _tmp2_;
 		CommandManager* _tmp3_;
 		SavedSearch* _tmp4_;
@@ -1267,7 +1260,7 @@ static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 		_g_object_unref0 (_tmp6_);
 #line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1271 "SavedSearchPage.c"
+#line 1264 "SavedSearchPage.c"
 	}
 }
 
@@ -1288,7 +1281,7 @@ 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 1292 "SavedSearchPage.c"
+#line 1285 "SavedSearchPage.c"
 }
 
 
@@ -1302,13 +1295,15 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 	_tmp0_ = self->priv->search;
 #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = saved_search_dialog_new_edit_existing (_tmp0_);
+#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	g_object_ref_sink (_tmp1_);
 #line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	ssd = _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_dialog_show (ssd);
 #line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_saved_search_dialog_unref0 (ssd);
-#line 1312 "SavedSearchPage.c"
+	_g_object_unref0 (ssd);
+#line 1307 "SavedSearchPage.c"
 }
 
 
@@ -1330,7 +1325,7 @@ static void saved_search_page_real_update_actions (Page* base, gint selected_cou
 	_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 1334 "SavedSearchPage.c"
+#line 1329 "SavedSearchPage.c"
 }
 
 
@@ -1353,14 +1348,14 @@ 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 1357 "SavedSearchPage.c"
+#line 1352 "SavedSearchPage.c"
 }
 
 
 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 1364 "SavedSearchPage.c"
+#line 1359 "SavedSearchPage.c"
 }
 
 
@@ -1372,7 +1367,7 @@ 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 1376 "SavedSearchPage.c"
+#line 1371 "SavedSearchPage.c"
 }
 
 
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index a32204d..12966d0 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -748,10 +748,10 @@ enum  {
 };
 SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1);
 void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1);
-static gint __lambda12_ (void* a, void* b);
+static gint __lambda13_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
-static gint ___lambda12____compar_fn_t (void* key1, void* key2);
+static gint ___lambda13____compar_fn_t (void* key1, void* key2);
 gchar* search_condition_search_type_to_string (SearchConditionSearchType self);
 SearchConditionSearchType search_condition_search_type_from_string (const gchar* str);
 gboolean search_condition_predicate (SearchCondition* self, MediaSource* source);
@@ -1162,7 +1162,7 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le
 }
 
 
-static gint __lambda12_ (void* a, void* b) {
+static gint __lambda13_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_;
 	gchar* _tmp1_;
@@ -1187,9 +1187,9 @@ static gint __lambda12_ (void* a, void* b) {
 }
 
 
-static gint ___lambda12____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda13____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda12_ (key1, key2);
+	result = __lambda13_ (key1, key2);
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
 #line 1196 "SearchBoolean.c"
@@ -1210,7 +1210,7 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp1__length1 = *array_length1;
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda12____compar_fn_t);
+	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda13____compar_fn_t);
 #line 1215 "SearchBoolean.c"
 }
 
@@ -5665,7 +5665,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5658 "SearchBoolean.c"
-				goto __catch78_database_error;
+				goto __catch86_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5681,8 +5681,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_tmp6_->search_id = _tmp0_;
 #line 5673 "SearchBoolean.c"
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally86;
+	__catch86_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_;
@@ -5698,7 +5698,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_g_error_free0 (err);
 #line 5690 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally86:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5811,7 +5811,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5804 "SearchBoolean.c"
-				goto __catch79_database_error;
+				goto __catch87_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5822,8 +5822,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 5813 "SearchBoolean.c"
 		}
 	}
-	goto __finally79;
-	__catch79_database_error:
+	goto __finally87;
+	__catch87_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_;
@@ -5843,7 +5843,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		return result;
 #line 5835 "SearchBoolean.c"
 	}
-	__finally79:
+	__finally87:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5840 "SearchBoolean.c"
@@ -6019,7 +6019,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6012 "SearchBoolean.c"
-				goto __catch80_database_error;
+				goto __catch88_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6108,8 +6108,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_object_unref0 (_tmp0_);
 #line 6100 "SearchBoolean.c"
 	}
-	goto __finally80;
-	__catch80_database_error:
+	goto __finally88;
+	__catch88_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_;
@@ -6125,7 +6125,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 6117 "SearchBoolean.c"
 	}
-	__finally80:
+	__finally88:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6258,7 +6258,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6251 "SearchBoolean.c"
-				goto __catch81_database_error;
+				goto __catch89_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6280,8 +6280,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_saved_search_row_unref0 (_tmp0_);
 #line 6272 "SearchBoolean.c"
 	}
-	goto __finally81;
-	__catch81_database_error:
+	goto __finally89;
+	__catch89_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_;
@@ -6297,7 +6297,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_g_error_free0 (err);
 #line 6289 "SearchBoolean.c"
 	}
-	__finally81:
+	__finally89:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6362,7 +6362,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6355 "SearchBoolean.c"
-				goto __catch82_database_error;
+				goto __catch90_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6373,8 +6373,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 6364 "SearchBoolean.c"
 		}
 	}
-	goto __finally82;
-	__catch82_database_error:
+	goto __finally90;
+	__catch90_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_;
@@ -6390,7 +6390,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		_g_error_free0 (err);
 #line 6382 "SearchBoolean.c"
 	}
-	__finally82:
+	__finally90:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
diff --git a/src/searches/SearchesBranch.c b/src/searches/SearchesBranch.c
new file mode 100644
index 0000000..dfa635b
--- /dev/null
+++ b/src/searches/SearchesBranch.c
@@ -0,0 +1,1509 @@
+/* SearchesBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from SearchesBranch.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gee.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <glib/gi18n-lib.h>
+#include <gio/gio.h>
+
+
+#define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ())
+#define SIDEBAR_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_BRANCH, SidebarBranch))
+#define SIDEBAR_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_BRANCH, SidebarBranchClass))
+#define SIDEBAR_IS_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_BRANCH))
+#define SIDEBAR_IS_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_BRANCH))
+#define SIDEBAR_BRANCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_BRANCH, SidebarBranchClass))
+
+typedef struct _SidebarBranch SidebarBranch;
+typedef struct _SidebarBranchClass SidebarBranchClass;
+typedef struct _SidebarBranchPrivate SidebarBranchPrivate;
+
+#define SEARCHES_TYPE_BRANCH (searches_branch_get_type ())
+#define SEARCHES_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCHES_TYPE_BRANCH, SearchesBranch))
+#define SEARCHES_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEARCHES_TYPE_BRANCH, SearchesBranchClass))
+#define SEARCHES_IS_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEARCHES_TYPE_BRANCH))
+#define SEARCHES_IS_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEARCHES_TYPE_BRANCH))
+#define SEARCHES_BRANCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEARCHES_TYPE_BRANCH, SearchesBranchClass))
+
+typedef struct _SearchesBranch SearchesBranch;
+typedef struct _SearchesBranchClass SearchesBranchClass;
+typedef struct _SearchesBranchPrivate SearchesBranchPrivate;
+
+#define TYPE_DATA_OBJECT (data_object_get_type ())
+#define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject))
+#define DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_OBJECT, DataObjectClass))
+#define IS_DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_OBJECT))
+#define IS_DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_OBJECT))
+#define DATA_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_OBJECT, DataObjectClass))
+
+typedef struct _DataObject DataObject;
+typedef struct _DataObjectClass DataObjectClass;
+
+#define TYPE_DATA_SOURCE (data_source_get_type ())
+#define DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_SOURCE, DataSource))
+#define DATA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_SOURCE, DataSourceClass))
+#define IS_DATA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_SOURCE))
+#define IS_DATA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_SOURCE))
+#define DATA_SOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_SOURCE, DataSourceClass))
+
+typedef struct _DataSource DataSource;
+typedef struct _DataSourceClass DataSourceClass;
+
+#define TYPE_SAVED_SEARCH (saved_search_get_type ())
+#define SAVED_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH, SavedSearch))
+#define SAVED_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH, SavedSearchClass))
+#define IS_SAVED_SEARCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH))
+#define IS_SAVED_SEARCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH))
+#define SAVED_SEARCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH, SavedSearchClass))
+
+typedef struct _SavedSearch SavedSearch;
+typedef struct _SavedSearchClass SavedSearchClass;
+
+#define SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY (sidebar_simple_page_entry_get_type ())
+#define SIDEBAR_SIMPLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry))
+#define SIDEBAR_SIMPLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntryClass))
+#define SIDEBAR_IS_SIMPLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY))
+#define SIDEBAR_IS_SIMPLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY))
+#define SIDEBAR_SIMPLE_PAGE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntryClass))
+
+typedef struct _SidebarSimplePageEntry SidebarSimplePageEntry;
+typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
+
+#define SEARCHES_TYPE_SIDEBAR_ENTRY (searches_sidebar_entry_get_type ())
+#define SEARCHES_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry))
+#define SEARCHES_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryClass))
+#define SEARCHES_IS_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEARCHES_TYPE_SIDEBAR_ENTRY))
+#define SEARCHES_IS_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEARCHES_TYPE_SIDEBAR_ENTRY))
+#define SEARCHES_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryClass))
+
+typedef struct _SearchesSidebarEntry SearchesSidebarEntry;
+typedef struct _SearchesSidebarEntryClass SearchesSidebarEntryClass;
+
+#define TYPE_SAVED_SEARCH_TABLE (saved_search_table_get_type ())
+#define SAVED_SEARCH_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_TABLE, SavedSearchTable))
+#define SAVED_SEARCH_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH_TABLE, SavedSearchTableClass))
+#define IS_SAVED_SEARCH_TABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH_TABLE))
+#define IS_SAVED_SEARCH_TABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH_TABLE))
+#define SAVED_SEARCH_TABLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH_TABLE, SavedSearchTableClass))
+
+typedef struct _SavedSearchTable SavedSearchTable;
+typedef struct _SavedSearchTableClass SavedSearchTableClass;
+#define _saved_search_table_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_table_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define SIDEBAR_TYPE_GROUPING (sidebar_grouping_get_type ())
+#define SIDEBAR_GROUPING(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_GROUPING, SidebarGrouping))
+#define SIDEBAR_GROUPING_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_GROUPING, SidebarGroupingClass))
+#define SIDEBAR_IS_GROUPING(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_GROUPING))
+#define SIDEBAR_IS_GROUPING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_GROUPING))
+#define SIDEBAR_GROUPING_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_GROUPING, SidebarGroupingClass))
+
+typedef struct _SidebarGrouping SidebarGrouping;
+typedef struct _SidebarGroupingClass SidebarGroupingClass;
+
+#define SIDEBAR_TYPE_HEADER (sidebar_header_get_type ())
+#define SIDEBAR_HEADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_HEADER, SidebarHeader))
+#define SIDEBAR_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_HEADER, SidebarHeaderClass))
+#define SIDEBAR_IS_HEADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_HEADER))
+#define SIDEBAR_IS_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_HEADER))
+#define SIDEBAR_HEADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_HEADER, SidebarHeaderClass))
+
+typedef struct _SidebarHeader SidebarHeader;
+typedef struct _SidebarHeaderClass SidebarHeaderClass;
+
+#define SEARCHES_TYPE_HEADER (searches_header_get_type ())
+#define SEARCHES_HEADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SEARCHES_TYPE_HEADER, SearchesHeader))
+#define SEARCHES_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SEARCHES_TYPE_HEADER, SearchesHeaderClass))
+#define SEARCHES_IS_HEADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SEARCHES_TYPE_HEADER))
+#define SEARCHES_IS_HEADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SEARCHES_TYPE_HEADER))
+#define SEARCHES_HEADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SEARCHES_TYPE_HEADER, SearchesHeaderClass))
+
+typedef struct _SearchesHeader SearchesHeader;
+typedef struct _SearchesHeaderClass SearchesHeaderClass;
+
+#define SIDEBAR_TYPE_ENTRY (sidebar_entry_get_type ())
+#define SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_ENTRY, SidebarEntry))
+#define SIDEBAR_IS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_ENTRY))
+#define SIDEBAR_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_ENTRY, SidebarEntryIface))
+
+typedef struct _SidebarEntry SidebarEntry;
+typedef struct _SidebarEntryIface SidebarEntryIface;
+
+#define SIDEBAR_TYPE_TREE (sidebar_tree_get_type ())
+#define SIDEBAR_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_TREE, SidebarTree))
+#define SIDEBAR_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SIDEBAR_TYPE_TREE, SidebarTreeClass))
+#define SIDEBAR_IS_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_TREE))
+#define SIDEBAR_IS_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SIDEBAR_TYPE_TREE))
+#define SIDEBAR_TREE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SIDEBAR_TYPE_TREE, SidebarTreeClass))
+
+typedef struct _SidebarTree SidebarTree;
+typedef struct _SidebarTreeClass SidebarTreeClass;
+
+#define SIDEBAR_BRANCH_TYPE_OPTIONS (sidebar_branch_options_get_type ())
+
+#define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ())
+#define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry))
+#define SIDEBAR_IS_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY))
+#define SIDEBAR_EXPANDABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntryIface))
+
+typedef struct _SidebarExpandableEntry SidebarExpandableEntry;
+typedef struct _SidebarExpandableEntryIface SidebarExpandableEntryIface;
+
+#define SIDEBAR_TYPE_RENAMEABLE_ENTRY (sidebar_renameable_entry_get_type ())
+#define SIDEBAR_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry))
+#define SIDEBAR_IS_RENAMEABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY))
+#define SIDEBAR_RENAMEABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntryIface))
+
+typedef struct _SidebarRenameableEntry SidebarRenameableEntry;
+typedef struct _SidebarRenameableEntryIface SidebarRenameableEntryIface;
+typedef struct _SidebarGroupingPrivate SidebarGroupingPrivate;
+
+#define SIDEBAR_TYPE_EMPHASIZABLE_ENTRY (sidebar_emphasizable_entry_get_type ())
+#define SIDEBAR_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntry))
+#define SIDEBAR_IS_EMPHASIZABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY))
+#define SIDEBAR_EMPHASIZABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, SidebarEmphasizableEntryIface))
+
+typedef struct _SidebarEmphasizableEntry SidebarEmphasizableEntry;
+typedef struct _SidebarEmphasizableEntryIface SidebarEmphasizableEntryIface;
+typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate;
+
+#define SIDEBAR_TYPE_CONTEXTABLE (sidebar_contextable_get_type ())
+#define SIDEBAR_CONTEXTABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_CONTEXTABLE, SidebarContextable))
+#define SIDEBAR_IS_CONTEXTABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_CONTEXTABLE))
+#define SIDEBAR_CONTEXTABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_CONTEXTABLE, SidebarContextableIface))
+
+typedef struct _SidebarContextable SidebarContextable;
+typedef struct _SidebarContextableIface SidebarContextableIface;
+typedef struct _SearchesHeaderPrivate SearchesHeaderPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define TYPE_APPLICATION (application_get_type ())
+#define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application))
+#define APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APPLICATION, ApplicationClass))
+#define IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APPLICATION))
+#define IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APPLICATION))
+#define APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APPLICATION, ApplicationClass))
+
+typedef struct _Application Application;
+typedef struct _ApplicationClass ApplicationClass;
+#define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+
+#define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
+#define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
+#define SIDEBAR_IS_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY))
+#define SIDEBAR_SELECTABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntryIface))
+
+typedef struct _SidebarSelectableEntry SidebarSelectableEntry;
+typedef struct _SidebarSelectableEntryIface SidebarSelectableEntryIface;
+
+#define SIDEBAR_TYPE_PAGE_REPRESENTATIVE (sidebar_page_representative_get_type ())
+#define SIDEBAR_PAGE_REPRESENTATIVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative))
+#define SIDEBAR_IS_PAGE_REPRESENTATIVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_PAGE_REPRESENTATIVE))
+#define SIDEBAR_PAGE_REPRESENTATIVE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentativeIface))
+
+typedef struct _SidebarPageRepresentative SidebarPageRepresentative;
+typedef struct _SidebarPageRepresentativeIface SidebarPageRepresentativeIface;
+
+#define TYPE_PAGE (page_get_type ())
+#define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page))
+#define PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE, PageClass))
+#define IS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE))
+#define IS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE))
+#define PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE, PageClass))
+
+typedef struct _Page Page;
+typedef struct _PageClass PageClass;
+typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
+
+#define SIDEBAR_TYPE_DESTROYABLE_ENTRY (sidebar_destroyable_entry_get_type ())
+#define SIDEBAR_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntry))
+#define SIDEBAR_IS_DESTROYABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY))
+#define SIDEBAR_DESTROYABLE_ENTRY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SIDEBAR_TYPE_DESTROYABLE_ENTRY, SidebarDestroyableEntryIface))
+
+typedef struct _SidebarDestroyableEntry SidebarDestroyableEntry;
+typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface;
+typedef struct _SearchesSidebarEntryPrivate SearchesSidebarEntryPrivate;
+
+#define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
+#define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage))
+#define CHECKERBOARD_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CHECKERBOARD_PAGE, CheckerboardPageClass))
+#define IS_CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CHECKERBOARD_PAGE))
+#define IS_CHECKERBOARD_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CHECKERBOARD_PAGE))
+#define CHECKERBOARD_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPageClass))
+
+typedef struct _CheckerboardPage CheckerboardPage;
+typedef struct _CheckerboardPageClass CheckerboardPageClass;
+
+#define TYPE_MEDIA_PAGE (media_page_get_type ())
+#define MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_PAGE, MediaPage))
+#define MEDIA_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_PAGE, MediaPageClass))
+#define IS_MEDIA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_PAGE))
+#define IS_MEDIA_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_PAGE))
+#define MEDIA_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_PAGE, MediaPageClass))
+
+typedef struct _MediaPage MediaPage;
+typedef struct _MediaPageClass MediaPageClass;
+
+#define TYPE_COLLECTION_PAGE (collection_page_get_type ())
+#define COLLECTION_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COLLECTION_PAGE, CollectionPage))
+#define COLLECTION_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COLLECTION_PAGE, CollectionPageClass))
+#define IS_COLLECTION_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COLLECTION_PAGE))
+#define IS_COLLECTION_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COLLECTION_PAGE))
+#define COLLECTION_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COLLECTION_PAGE, CollectionPageClass))
+
+typedef struct _CollectionPage CollectionPage;
+typedef struct _CollectionPageClass CollectionPageClass;
+
+#define TYPE_SAVED_SEARCH_PAGE (saved_search_page_get_type ())
+#define SAVED_SEARCH_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_PAGE, SavedSearchPage))
+#define SAVED_SEARCH_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH_PAGE, SavedSearchPageClass))
+#define IS_SAVED_SEARCH_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH_PAGE))
+#define IS_SAVED_SEARCH_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH_PAGE))
+#define SAVED_SEARCH_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH_PAGE, SavedSearchPageClass))
+
+typedef struct _SavedSearchPage SavedSearchPage;
+typedef struct _SavedSearchPageClass SavedSearchPageClass;
+
+#define TYPE_COMMAND_MANAGER (command_manager_get_type ())
+#define COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_MANAGER, CommandManager))
+#define COMMAND_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND_MANAGER, CommandManagerClass))
+#define IS_COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMMAND_MANAGER))
+#define IS_COMMAND_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMMAND_MANAGER))
+#define COMMAND_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COMMAND_MANAGER, CommandManagerClass))
+
+typedef struct _CommandManager CommandManager;
+typedef struct _CommandManagerClass CommandManagerClass;
+
+#define TYPE_COMMAND (command_get_type ())
+#define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command))
+#define COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND, CommandClass))
+#define IS_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMMAND))
+#define IS_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMMAND))
+#define COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COMMAND, CommandClass))
+
+typedef struct _Command Command;
+typedef struct _CommandClass CommandClass;
+
+#define TYPE_PAGE_COMMAND (page_command_get_type ())
+#define PAGE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_COMMAND, PageCommand))
+#define PAGE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_COMMAND, PageCommandClass))
+#define IS_PAGE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_COMMAND))
+#define IS_PAGE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_COMMAND))
+#define PAGE_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_COMMAND, PageCommandClass))
+
+typedef struct _PageCommand PageCommand;
+typedef struct _PageCommandClass PageCommandClass;
+
+#define TYPE_SINGLE_DATA_SOURCE_COMMAND (single_data_source_command_get_type ())
+#define SINGLE_DATA_SOURCE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand))
+#define SINGLE_DATA_SOURCE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommandClass))
+#define IS_SINGLE_DATA_SOURCE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SINGLE_DATA_SOURCE_COMMAND))
+#define IS_SINGLE_DATA_SOURCE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SINGLE_DATA_SOURCE_COMMAND))
+#define SINGLE_DATA_SOURCE_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommandClass))
+
+typedef struct _SingleDataSourceCommand SingleDataSourceCommand;
+typedef struct _SingleDataSourceCommandClass SingleDataSourceCommandClass;
+
+#define TYPE_RENAME_SAVED_SEARCH_COMMAND (rename_saved_search_command_get_type ())
+#define RENAME_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommand))
+#define RENAME_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommandClass))
+#define IS_RENAME_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RENAME_SAVED_SEARCH_COMMAND))
+#define IS_RENAME_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RENAME_SAVED_SEARCH_COMMAND))
+#define RENAME_SAVED_SEARCH_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RENAME_SAVED_SEARCH_COMMAND, RenameSavedSearchCommandClass))
+
+typedef struct _RenameSavedSearchCommand RenameSavedSearchCommand;
+typedef struct _RenameSavedSearchCommandClass RenameSavedSearchCommandClass;
+#define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL)))
+
+#define TYPE_DELETE_SAVED_SEARCH_COMMAND (delete_saved_search_command_get_type ())
+#define DELETE_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommand))
+#define DELETE_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommandClass))
+#define IS_DELETE_SAVED_SEARCH_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DELETE_SAVED_SEARCH_COMMAND))
+#define IS_DELETE_SAVED_SEARCH_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DELETE_SAVED_SEARCH_COMMAND))
+#define DELETE_SAVED_SEARCH_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DELETE_SAVED_SEARCH_COMMAND, DeleteSavedSearchCommandClass))
+
+typedef struct _DeleteSavedSearchCommand DeleteSavedSearchCommand;
+typedef struct _DeleteSavedSearchCommandClass DeleteSavedSearchCommandClass;
+#define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+#define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
+#define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
+#define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
+
+struct _SidebarBranch {
+	GObject parent_instance;
+	SidebarBranchPrivate * priv;
+};
+
+struct _SidebarBranchClass {
+	GObjectClass parent_class;
+};
+
+struct _SearchesBranch {
+	SidebarBranch parent_instance;
+	SearchesBranchPrivate * priv;
+};
+
+struct _SearchesBranchClass {
+	SidebarBranchClass parent_class;
+};
+
+struct _SearchesBranchPrivate {
+	GeeHashMap* entry_map;
+};
+
+struct _SidebarEntryIface {
+	GTypeInterface parent_iface;
+	gchar* (*get_sidebar_name) (SidebarEntry* self);
+	gchar* (*get_sidebar_tooltip) (SidebarEntry* self);
+	gchar* (*get_sidebar_icon) (SidebarEntry* self);
+	gchar* (*to_string) (SidebarEntry* self);
+	void (*grafted) (SidebarEntry* self, SidebarTree* tree);
+	void (*pruned) (SidebarEntry* self, SidebarTree* tree);
+};
+
+typedef enum  {
+	SIDEBAR_BRANCH_OPTIONS_NONE = 0,
+	SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY = 1 << 0,
+	SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD = 1 << 1,
+	SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD = 1 << 2,
+	SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING = 1 << 3
+} SidebarBranchOptions;
+
+struct _SidebarExpandableEntryIface {
+	GTypeInterface parent_iface;
+	gboolean (*expand_on_select) (SidebarExpandableEntry* self);
+};
+
+struct _SidebarRenameableEntryIface {
+	GTypeInterface parent_iface;
+	void (*rename) (SidebarRenameableEntry* self, const gchar* new_name);
+	gboolean (*is_user_renameable) (SidebarRenameableEntry* self);
+};
+
+struct _SidebarGrouping {
+	GObject parent_instance;
+	SidebarGroupingPrivate * priv;
+};
+
+struct _SidebarGroupingClass {
+	GObjectClass parent_class;
+};
+
+struct _SidebarEmphasizableEntryIface {
+	GTypeInterface parent_iface;
+	gboolean (*is_emphasized) (SidebarEmphasizableEntry* self);
+};
+
+struct _SidebarHeader {
+	SidebarGrouping parent_instance;
+	SidebarHeaderPrivate * priv;
+};
+
+struct _SidebarHeaderClass {
+	SidebarGroupingClass parent_class;
+};
+
+struct _SidebarContextableIface {
+	GTypeInterface parent_iface;
+	GtkMenu* (*get_sidebar_context_menu) (SidebarContextable* self, GdkEventButton* event);
+};
+
+struct _SearchesHeader {
+	SidebarHeader parent_instance;
+	SearchesHeaderPrivate * priv;
+};
+
+struct _SearchesHeaderClass {
+	SidebarHeaderClass parent_class;
+};
+
+struct _SearchesHeaderPrivate {
+	GtkBuilder* builder;
+	GtkMenu* context_menu;
+};
+
+struct _SidebarSelectableEntryIface {
+	GTypeInterface parent_iface;
+};
+
+struct _SidebarPageRepresentativeIface {
+	GTypeInterface parent_iface;
+	gboolean (*has_page) (SidebarPageRepresentative* self);
+	Page* (*get_page) (SidebarPageRepresentative* self);
+};
+
+struct _SidebarSimplePageEntry {
+	GObject parent_instance;
+	SidebarSimplePageEntryPrivate * priv;
+};
+
+struct _SidebarSimplePageEntryClass {
+	GObjectClass parent_class;
+	gchar* (*get_sidebar_name) (SidebarSimplePageEntry* self);
+	gchar* (*get_sidebar_tooltip) (SidebarSimplePageEntry* self);
+	gchar* (*get_sidebar_icon) (SidebarSimplePageEntry* self);
+	gchar* (*to_string) (SidebarSimplePageEntry* self);
+	Page* (*create_page) (SidebarSimplePageEntry* self);
+};
+
+struct _SidebarDestroyableEntryIface {
+	GTypeInterface parent_iface;
+	void (*destroy_source) (SidebarDestroyableEntry* self);
+};
+
+struct _SearchesSidebarEntry {
+	SidebarSimplePageEntry parent_instance;
+	SearchesSidebarEntryPrivate * priv;
+};
+
+struct _SearchesSidebarEntryClass {
+	SidebarSimplePageEntryClass parent_class;
+};
+
+struct _SearchesSidebarEntryPrivate {
+	SavedSearch* search;
+};
+
+
+static gpointer searches_branch_parent_class = NULL;
+static gpointer searches_header_parent_class = NULL;
+static SidebarContextableIface * searches_header_sidebar_contextable_parent_iface = NULL;
+static gpointer searches_sidebar_entry_parent_class = NULL;
+static gchar* searches_sidebar_entry_single_search_icon;
+static gchar* searches_sidebar_entry_single_search_icon = NULL;
+static SidebarRenameableEntryIface * searches_sidebar_entry_sidebar_renameable_entry_parent_iface = NULL;
+static SidebarDestroyableEntryIface * searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = NULL;
+
+GType sidebar_branch_get_type (void) G_GNUC_CONST;
+GType searches_branch_get_type (void) G_GNUC_CONST;
+GType data_object_get_type (void) G_GNUC_CONST;
+GType data_source_get_type (void) G_GNUC_CONST;
+GType saved_search_get_type (void) G_GNUC_CONST;
+GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
+GType searches_sidebar_entry_get_type (void) G_GNUC_CONST;
+#define SEARCHES_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_BRANCH, SearchesBranchPrivate))
+enum  {
+	SEARCHES_BRANCH_DUMMY_PROPERTY
+};
+gpointer saved_search_table_ref (gpointer instance);
+void saved_search_table_unref (gpointer instance);
+GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_saved_search_table (GValue* value, gpointer v_object);
+void value_take_saved_search_table (GValue* value, gpointer v_object);
+gpointer value_get_saved_search_table (const GValue* value);
+GType saved_search_table_get_type (void) G_GNUC_CONST;
+SavedSearchTable* saved_search_table_get_instance (void);
+static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search);
+static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self);
+static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search);
+static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self);
+SearchesBranch* searches_branch_new (void);
+SearchesBranch* searches_branch_construct (GType object_type);
+SearchesHeader* searches_header_new (void);
+SearchesHeader* searches_header_construct (GType object_type);
+GType sidebar_grouping_get_type (void) G_GNUC_CONST;
+GType sidebar_header_get_type (void) G_GNUC_CONST;
+GType searches_header_get_type (void) G_GNUC_CONST;
+GType sidebar_tree_get_type (void) G_GNUC_CONST;
+GType sidebar_entry_get_type (void) G_GNUC_CONST;
+GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
+static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b);
+static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
+GeeCollection* saved_search_table_get_all (SavedSearchTable* self);
+SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search);
+gint saved_search_compare_names (void* a, void* b);
+SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self);
+SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search);
+SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search);
+void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
+void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
+static void searches_branch_finalize (GObject * obj);
+GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
+GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
+GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
+GType sidebar_contextable_get_type (void) G_GNUC_CONST;
+#define SEARCHES_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_HEADER, SearchesHeaderPrivate))
+enum  {
+	SEARCHES_HEADER_DUMMY_PROPERTY
+};
+SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
+static void searches_header_setup_context_menu (SearchesHeader* self);
+gchar* resources_get_ui (const gchar* filename);
+void app_window_error_message (const gchar* message, GtkWindow* parent);
+gpointer application_ref (gpointer instance);
+void application_unref (gpointer instance);
+GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_application (GValue* value, gpointer v_object);
+void value_take_application (GValue* value, gpointer v_object);
+gpointer value_get_application (const GValue* value);
+GType application_get_type (void) G_GNUC_CONST;
+Application* application_get_instance (void);
+void application_panic (Application* self);
+static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
+static void searches_header_finalize (GObject * obj);
+GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
+GType page_get_type (void) G_GNUC_CONST;
+GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
+GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST;
+#define SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryPrivate))
+enum  {
+	SEARCHES_SIDEBAR_ENTRY_DUMMY_PROPERTY
+};
+SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
+void searches_sidebar_entry_init (void);
+void searches_sidebar_entry_terminate (void);
+static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
+gchar* data_object_get_name (DataObject* self);
+static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
+static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
+SavedSearchPage* saved_search_page_new (SavedSearch* search);
+SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search);
+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;
+static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base);
+static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name);
+gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name);
+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);
+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);
+RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name);
+RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name);
+GType page_command_get_type (void) G_GNUC_CONST;
+GType single_data_source_command_get_type (void) G_GNUC_CONST;
+GType rename_saved_search_command_get_type (void) G_GNUC_CONST;
+gchar* resources_rename_search_exists_message (const gchar* name);
+static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base);
+gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
+DeleteSavedSearchCommand* delete_saved_search_command_new (SavedSearch* search);
+DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_type, SavedSearch* search);
+GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
+static void searches_sidebar_entry_finalize (GObject * obj);
+
+
+static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_branch_on_saved_search_added ((SearchesBranch*) self, search);
+#line 612 "SearchesBranch.c"
+}
+
+
+static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_branch_on_saved_search_removed ((SearchesBranch*) self, search);
+#line 619 "SearchesBranch.c"
+}
+
+
+static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+	gint result;
+	result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 628 "SearchesBranch.c"
+}
+
+
+SearchesBranch* searches_branch_construct (GType object_type) {
+	SearchesBranch * self = NULL;
+	SearchesHeader* _tmp0_;
+	SearchesHeader* _tmp1_;
+	SavedSearchTable* _tmp13_;
+	SavedSearchTable* _tmp14_;
+	SavedSearchTable* _tmp15_;
+	SavedSearchTable* _tmp16_;
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = searches_header_new ();
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = _tmp0_;
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL);
+#line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (_tmp1_);
+#line 648 "SearchesBranch.c"
+	{
+		GeeIterator* _search_it = NULL;
+		SavedSearchTable* _tmp2_;
+		SavedSearchTable* _tmp3_;
+		GeeCollection* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeIterator* _tmp6_;
+		GeeIterator* _tmp7_;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp2_ = saved_search_table_get_instance ();
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp3_ = _tmp2_;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp4_ = saved_search_table_get_all (_tmp3_);
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp5_ = _tmp4_;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp7_ = _tmp6_;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_object_unref0 (_tmp5_);
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_saved_search_table_unref0 (_tmp3_);
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_search_it = _tmp7_;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		while (TRUE) {
+#line 677 "SearchesBranch.c"
+			GeeIterator* _tmp8_;
+			gboolean _tmp9_;
+			SavedSearch* search = NULL;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			SavedSearch* _tmp12_;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp8_ = _search_it;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp9_ = gee_iterator_next (_tmp8_);
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			if (!_tmp9_) {
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+				break;
+#line 692 "SearchesBranch.c"
+			}
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp10_ = _search_it;
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp11_ = gee_iterator_get (_tmp10_);
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			search = (SavedSearch*) _tmp11_;
+#line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp12_ = search;
+#line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			searches_branch_on_saved_search_added (self, _tmp12_);
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_g_object_unref0 (search);
+#line 706 "SearchesBranch.c"
+		}
+#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_object_unref0 (_search_it);
+#line 710 "SearchesBranch.c"
+	}
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp13_ = saved_search_table_get_instance ();
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp14_ = _tmp13_;
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_signal_connect_object (_tmp14_, "search-added", (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self, 0);
+#line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_saved_search_table_unref0 (_tmp14_);
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp15_ = saved_search_table_get_instance ();
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp16_ = _tmp15_;
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_signal_connect_object (_tmp16_, "search-removed", (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self, 0);
+#line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_saved_search_table_unref0 (_tmp16_);
+#line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return self;
+#line 730 "SearchesBranch.c"
+}
+
+
+SearchesBranch* searches_branch_new (void) {
+#line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return searches_branch_construct (SEARCHES_TYPE_BRANCH);
+#line 737 "SearchesBranch.c"
+}
+
+
+SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search) {
+	SearchesSidebarEntry* result = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gpointer _tmp2_;
+#line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL);
+#line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = self->priv->entry_map;
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = search;
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = (SearchesSidebarEntry*) _tmp2_;
+#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 760 "SearchesBranch.c"
+}
+
+
+static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
+	gint result = 0;
+	SidebarEntry* _tmp0_;
+	SidebarEntry* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SavedSearch* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SavedSearch* _tmp5_;
+	gint _tmp6_;
+#line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
+#line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
+#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = a;
+#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = b;
+#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	if (_tmp0_ == _tmp1_) {
+#line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		result = 0;
+#line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		return result;
+#line 787 "SearchesBranch.c"
+	}
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp2_ = a;
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp3_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp4_ = b;
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp5_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp6_ = saved_search_compare_names (_tmp3_, _tmp5_);
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = _tmp6_;
+#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 803 "SearchesBranch.c"
+}
+
+
+static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search) {
+	SearchesSidebarEntry* entry = NULL;
+	SavedSearch* _tmp0_;
+	SearchesSidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
+	SavedSearch* _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
+#line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_if_fail (SEARCHES_IS_BRANCH (self));
+#line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_if_fail (IS_SAVED_SEARCH (search));
+#line 45 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_debug ("SearchesBranch.vala:45: search added");
+#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = search;
+#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = searches_sidebar_entry_new (_tmp0_);
+#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	entry = _tmp1_;
+#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp2_ = self->priv->entry_map;
+#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp3_ = search;
+#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry);
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp5_ = _tmp4_;
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+#line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (_tmp5_);
+#line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (entry);
+#line 843 "SearchesBranch.c"
+}
+
+
+static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search) {
+	SearchesSidebarEntry* entry = NULL;
+	GeeHashMap* _tmp0_;
+	SavedSearch* _tmp1_;
+	gpointer _tmp2_;
+	gboolean is_removed = FALSE;
+	GeeHashMap* _tmp3_;
+	SavedSearch* _tmp4_;
+	gboolean _tmp5_;
+#line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_if_fail (SEARCHES_IS_BRANCH (self));
+#line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_if_fail (IS_SAVED_SEARCH (search));
+#line 52 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_debug ("SearchesBranch.vala:52: search removed");
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = self->priv->entry_map;
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = search;
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	entry = (SearchesSidebarEntry*) _tmp2_;
+#line 54 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_vala_assert (entry != NULL, "entry != null");
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp3_ = self->priv->entry_map;
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp4_ = search;
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL);
+#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	is_removed = _tmp5_;
+#line 57 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_vala_assert (is_removed, "is_removed");
+#line 59 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (entry);
+#line 886 "SearchesBranch.c"
+}
+
+
+static void searches_branch_class_init (SearchesBranchClass * klass) {
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_branch_parent_class = g_type_class_peek_parent (klass);
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_type_class_add_private (klass, sizeof (SearchesBranchPrivate));
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize;
+#line 897 "SearchesBranch.c"
+}
+
+
+static void searches_branch_instance_init (SearchesBranch * self) {
+	GeeHashMap* _tmp0_;
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self->priv = SEARCHES_BRANCH_GET_PRIVATE (self);
+#line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self->priv->entry_map = _tmp0_;
+#line 909 "SearchesBranch.c"
+}
+
+
+static void searches_branch_finalize (GObject * obj) {
+	SearchesBranch * self;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	guint _tmp2_;
+	SavedSearchTable* _tmp3_;
+	SavedSearchTable* _tmp4_;
+	guint _tmp5_;
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_BRANCH, SearchesBranch);
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = saved_search_table_get_instance ();
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = _tmp0_;
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_signal_parse_name ("search-added", TYPE_SAVED_SEARCH_TABLE, &_tmp2_, NULL, FALSE);
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self);
+#line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_saved_search_table_unref0 (_tmp1_);
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp3_ = saved_search_table_get_instance ();
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp4_ = _tmp3_;
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_signal_parse_name ("search-removed", TYPE_SAVED_SEARCH_TABLE, &_tmp5_, NULL, FALSE);
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self);
+#line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_saved_search_table_unref0 (_tmp4_);
+#line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (self->priv->entry_map);
+#line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj);
+#line 947 "SearchesBranch.c"
+}
+
+
+GType searches_branch_get_type (void) {
+	static volatile gsize searches_branch_type_id__volatile = 0;
+	if (g_once_init_enter (&searches_branch_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SearchesBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesBranch), 0, (GInstanceInitFunc) searches_branch_instance_init, NULL };
+		GType searches_branch_type_id;
+		searches_branch_type_id = g_type_register_static (SIDEBAR_TYPE_BRANCH, "SearchesBranch", &g_define_type_info, 0);
+		g_once_init_leave (&searches_branch_type_id__volatile, searches_branch_type_id);
+	}
+	return searches_branch_type_id__volatile;
+}
+
+
+SearchesHeader* searches_header_construct (GType object_type) {
+	SearchesHeader * self = NULL;
+#line 68 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), _ ("Organize your saved searches"), TRUE);
+#line 69 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_header_setup_context_menu (self);
+#line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return self;
+#line 971 "SearchesBranch.c"
+}
+
+
+SearchesHeader* searches_header_new (void) {
+#line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return searches_header_construct (SEARCHES_TYPE_HEADER);
+#line 978 "SearchesBranch.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 985 "SearchesBranch.c"
+}
+
+
+static void searches_header_setup_context_menu (SearchesHeader* self) {
+	GtkBuilder* _tmp0_;
+	GError * _inner_error_ = NULL;
+#line 72 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_if_fail (SEARCHES_IS_HEADER (self));
+#line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = gtk_builder_new ();
+#line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self->priv->builder = _tmp0_;
+#line 1000 "SearchesBranch.c"
+	{
+		GtkBuilder* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp4_;
+		GObject* _tmp5_;
+		GMenuModel* _tmp6_;
+		GMenuModel* _tmp7_;
+		GtkMenu* _tmp8_;
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp1_ = self->priv->builder;
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp2_ = resources_get_ui ("search_sidebar_context.ui");
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp3_ = _tmp2_;
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_free0 (_tmp3_);
+#line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1023 "SearchesBranch.c"
+			goto __catch85_g_error;
+		}
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp4_ = self->priv->builder;
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp5_) : NULL);
+#line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		model = _tmp6_;
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp7_ = model;
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		g_object_ref_sink (_tmp8_);
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_object_unref0 (self->priv->context_menu);
+#line 77 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		self->priv->context_menu = _tmp8_;
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_object_unref0 (model);
+#line 1046 "SearchesBranch.c"
+	}
+	goto __finally85;
+	__catch85_g_error:
+	{
+		GError* _error_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		Application* _tmp13_;
+		Application* _tmp14_;
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_error_ = _inner_error_;
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_inner_error_ = NULL;
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp9_ = _error_;
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp10_ = _tmp9_->message;
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp12_ = _tmp11_;
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		app_window_error_message (_tmp12_, NULL);
+#line 79 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_free0 (_tmp12_);
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp13_ = application_get_instance ();
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp14_ = _tmp13_;
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		application_panic (_tmp14_);
+#line 81 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_application_unref0 (_tmp14_);
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_error_free0 (_error_);
+#line 1084 "SearchesBranch.c"
+	}
+	__finally85:
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		g_clear_error (&_inner_error_);
+#line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		return;
+#line 1095 "SearchesBranch.c"
+	}
+}
+
+
+static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
+	SearchesHeader * self;
+	GtkMenu* result = NULL;
+	GtkMenu* _tmp0_;
+	GtkMenu* _tmp1_;
+#line 85 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = self->priv->context_menu;
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = _tmp1_;
+#line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 1115 "SearchesBranch.c"
+}
+
+
+static void searches_header_class_init (SearchesHeaderClass * klass) {
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_header_parent_class = g_type_class_peek_parent (klass);
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
+#line 1126 "SearchesBranch.c"
+}
+
+
+static void searches_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) {
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
+#line 1135 "SearchesBranch.c"
+}
+
+
+static void searches_header_instance_init (SearchesHeader * self) {
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
+#line 65 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self->priv->context_menu = NULL;
+#line 1144 "SearchesBranch.c"
+}
+
+
+static void searches_header_finalize (GObject * obj) {
+	SearchesHeader * self;
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader);
+#line 64 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 65 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (self->priv->context_menu);
+#line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
+#line 1158 "SearchesBranch.c"
+}
+
+
+GType searches_header_get_type (void) {
+	static volatile gsize searches_header_type_id__volatile = 0;
+	if (g_once_init_enter (&searches_header_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SearchesHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesHeader), 0, (GInstanceInitFunc) searches_header_instance_init, NULL };
+		static const GInterfaceInfo sidebar_contextable_info = { (GInterfaceInitFunc) searches_header_sidebar_contextable_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType searches_header_type_id;
+		searches_header_type_id = g_type_register_static (SIDEBAR_TYPE_HEADER, "SearchesHeader", &g_define_type_info, 0);
+		g_type_add_interface_static (searches_header_type_id, SIDEBAR_TYPE_CONTEXTABLE, &sidebar_contextable_info);
+		g_once_init_leave (&searches_header_type_id__volatile, searches_header_type_id);
+	}
+	return searches_header_type_id__volatile;
+}
+
+
+SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search) {
+	SearchesSidebarEntry * self = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = search;
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (self->priv->search);
+#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self->priv->search = _tmp1_;
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return self;
+#line 1194 "SearchesBranch.c"
+}
+
+
+SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
+#line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
+#line 1201 "SearchesBranch.c"
+}
+
+
+void searches_sidebar_entry_init (void) {
+}
+
+
+void searches_sidebar_entry_terminate (void) {
+}
+
+
+SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) {
+	SavedSearch* result = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
+#line 106 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = self->priv->search;
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = _tmp1_;
+#line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 1227 "SearchesBranch.c"
+}
+
+
+static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+	SearchesSidebarEntry * self;
+	gchar* result = NULL;
+	SavedSearch* _tmp0_;
+	gchar* _tmp1_;
+#line 110 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = self->priv->search;
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = _tmp1_;
+#line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 1246 "SearchesBranch.c"
+}
+
+
+static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+	SearchesSidebarEntry * self;
+	gchar* result = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+#line 114 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = searches_sidebar_entry_single_search_icon;
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = _tmp1_;
+#line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 1265 "SearchesBranch.c"
+}
+
+
+static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+	SearchesSidebarEntry * self;
+	Page* result = NULL;
+	SavedSearch* _tmp0_;
+	SavedSearchPage* _tmp1_;
+#line 118 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = self->priv->search;
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = saved_search_page_new (_tmp0_);
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_object_ref_sink (_tmp1_);
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
+#line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 1286 "SearchesBranch.c"
+}
+
+
+static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
+	SearchesSidebarEntry * self;
+	gboolean result = FALSE;
+#line 122 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
+#line 123 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	result = TRUE;
+#line 123 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	return result;
+#line 1299 "SearchesBranch.c"
+}
+
+
+static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
+	SearchesSidebarEntry * self;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
+#line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
+#line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_return_if_fail (new_name != NULL);
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = saved_search_table_get_instance ();
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = _tmp0_;
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp2_ = new_name;
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_);
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp4_ = !_tmp3_;
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_saved_search_table_unref0 (_tmp1_);
+#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	if (_tmp4_) {
+#line 1328 "SearchesBranch.c"
+		CommandManager* _tmp5_;
+		CommandManager* _tmp6_;
+		SavedSearch* _tmp7_;
+		const gchar* _tmp8_;
+		RenameSavedSearchCommand* _tmp9_;
+		RenameSavedSearchCommand* _tmp10_;
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp5_ = app_window_get_command_manager ();
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp6_ = _tmp5_;
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp7_ = self->priv->search;
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp8_ = new_name;
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_);
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp10_ = _tmp9_;
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_object_unref0 (_tmp10_);
+#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_command_manager_unref0 (_tmp6_);
+#line 1353 "SearchesBranch.c"
+	} else {
+		const gchar* _tmp11_;
+		SavedSearch* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		gboolean _tmp15_;
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp11_ = new_name;
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp12_ = self->priv->search;
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp14_ = _tmp13_;
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0;
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_free0 (_tmp14_);
+#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		if (_tmp15_) {
+#line 1374 "SearchesBranch.c"
+			const gchar* _tmp16_;
+			gchar* _tmp17_;
+			gchar* _tmp18_;
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp16_ = new_name;
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_tmp18_ = _tmp17_;
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			app_window_error_message (_tmp18_, NULL);
+#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+			_g_free0 (_tmp18_);
+#line 1388 "SearchesBranch.c"
+		}
+	}
+}
+
+
+static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) {
+	SearchesSidebarEntry * self;
+	SavedSearch* _tmp0_;
+	gboolean _tmp1_;
+#line 133 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
+#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = self->priv->search;
+#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
+#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	if (_tmp1_) {
+#line 1406 "SearchesBranch.c"
+		CommandManager* _tmp2_;
+		CommandManager* _tmp3_;
+		SavedSearch* _tmp4_;
+		DeleteSavedSearchCommand* _tmp5_;
+		DeleteSavedSearchCommand* _tmp6_;
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp2_ = app_window_get_command_manager ();
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp3_ = _tmp2_;
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp4_ = self->priv->search;
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp5_ = delete_saved_search_command_new (_tmp4_);
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_tmp6_ = _tmp5_;
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_g_object_unref0 (_tmp6_);
+#line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+		_command_manager_unref0 (_tmp3_);
+#line 1428 "SearchesBranch.c"
+	}
+}
+
+
+static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
+	gchar* _tmp0_;
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_name;
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_get_sidebar_icon;
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) searches_sidebar_entry_real_create_page;
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
+#line 92 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_tmp0_ = g_strdup ("edit-find");
+#line 92 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_sidebar_entry_single_search_icon = _tmp0_;
+#line 1451 "SearchesBranch.c"
+}
+
+
+static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable;
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename;
+#line 1462 "SearchesBranch.c"
+}
+
+
+static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source;
+#line 1471 "SearchesBranch.c"
+}
+
+
+static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
+#line 1478 "SearchesBranch.c"
+}
+
+
+static void searches_sidebar_entry_finalize (GObject * obj) {
+	SearchesSidebarEntry * self;
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
+#line 94 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	_g_object_unref0 (self->priv->search);
+#line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
+	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
+#line 1490 "SearchesBranch.c"
+}
+
+
+GType searches_sidebar_entry_get_type (void) {
+	static volatile gsize searches_sidebar_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&searches_sidebar_entry_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SearchesSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesSidebarEntry), 0, (GInstanceInitFunc) searches_sidebar_entry_instance_init, NULL };
+		static const GInterfaceInfo sidebar_renameable_entry_info = { (GInterfaceInitFunc) searches_sidebar_entry_sidebar_renameable_entry_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		static const GInterfaceInfo sidebar_destroyable_entry_info = { (GInterfaceInitFunc) searches_sidebar_entry_sidebar_destroyable_entry_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType searches_sidebar_entry_type_id;
+		searches_sidebar_entry_type_id = g_type_register_static (SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, "SearchesSidebarEntry", &g_define_type_info, 0);
+		g_type_add_interface_static (searches_sidebar_entry_type_id, SIDEBAR_TYPE_RENAMEABLE_ENTRY, &sidebar_renameable_entry_info);
+		g_type_add_interface_static (searches_sidebar_entry_type_id, SIDEBAR_TYPE_DESTROYABLE_ENTRY, &sidebar_destroyable_entry_info);
+		g_once_init_leave (&searches_sidebar_entry_type_id__volatile, searches_sidebar_entry_type_id);
+	}
+	return searches_sidebar_entry_type_id__volatile;
+}
+
+
+
diff --git a/src/searches/SearchesBranch.vala b/src/searches/SearchesBranch.vala
new file mode 100644
index 0000000..caf8ac6
--- /dev/null
+++ b/src/searches/SearchesBranch.vala
@@ -0,0 +1,137 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+public class Searches.Branch : Sidebar.Branch {
+    private Gee.HashMap<SavedSearch, Searches.SidebarEntry> entry_map = 
+        new Gee.HashMap<SavedSearch, Searches.SidebarEntry>();
+    
+    public Branch() {
+        base (new Searches.Header(),
+            Sidebar.Branch.Options.HIDE_IF_EMPTY
+                | Sidebar.Branch.Options.AUTO_OPEN_ON_NEW_CHILD
+                | Sidebar.Branch.Options.STARTUP_EXPAND_TO_FIRST_CHILD,
+            comparator);
+        
+        // seed the branch with existing searches
+        foreach (SavedSearch search in SavedSearchTable.get_instance().get_all())
+            on_saved_search_added(search);
+        
+        // monitor collection for future events
+        SavedSearchTable.get_instance().search_added.connect(on_saved_search_added);
+        SavedSearchTable.get_instance().search_removed.connect(on_saved_search_removed);
+    }
+    
+    ~Branch() {
+        SavedSearchTable.get_instance().search_added.disconnect(on_saved_search_added);
+        SavedSearchTable.get_instance().search_removed.disconnect(on_saved_search_removed);
+    }
+    
+    public Searches.SidebarEntry? get_entry_for_saved_search(SavedSearch search) {
+        return entry_map.get(search);
+    }
+    
+    private static int comparator(Sidebar.Entry a, Sidebar.Entry b) {
+        if (a == b)
+            return 0;
+        
+        return SavedSearch.compare_names(((Searches.SidebarEntry) a).for_saved_search(),
+            ((Searches.SidebarEntry) b).for_saved_search());
+    }
+    
+    private void on_saved_search_added(SavedSearch search) {
+        debug("search added");
+        Searches.SidebarEntry entry = new Searches.SidebarEntry(search);
+        entry_map.set(search, entry);
+        graft(get_root(), entry);
+    }
+    
+    private void on_saved_search_removed(SavedSearch search) {
+        debug("search removed");
+        Searches.SidebarEntry? entry = entry_map.get(search);
+        assert(entry != null);
+        
+        bool is_removed = entry_map.unset(search);
+        assert(is_removed);
+        
+        prune(entry);
+    }
+}
+
+public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
+    private Gtk.Builder builder;
+    private Gtk.Menu? context_menu = null;
+    
+    public Header() {
+        base (_("Saved Searches"), _("Organize your saved searches"));
+        setup_context_menu();
+    }
+
+    private void setup_context_menu() {
+        this.builder = new Gtk.Builder ();
+        try {
+            this.builder.add_from_resource(Resources.get_ui("search_sidebar_context.ui"));
+            var model = builder.get_object ("popup-menu") as GLib.MenuModel;
+            this.context_menu = new Gtk.Menu.from_model (model);
+        } catch (Error error) {
+            AppWindow.error_message("Error loading UI resource: %s".printf(
+                error.message));
+            Application.get_instance().panic();
+        }
+    }
+
+    public Gtk.Menu? get_sidebar_context_menu(Gdk.EventButton? event) {
+        return context_menu;
+    }
+}
+
+public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry,
+    Sidebar.DestroyableEntry {
+    private static string single_search_icon = "edit-find";
+    
+    private SavedSearch search;
+    
+    public SidebarEntry(SavedSearch search) {
+        this.search = search;
+    }
+    
+    internal static void init() {
+    }
+    
+    internal static void terminate() {
+    }
+    
+    public SavedSearch for_saved_search() {
+        return search;
+    }
+    
+    public override string get_sidebar_name() {
+        return search.get_name();
+    }
+    
+    public override string? get_sidebar_icon() {
+        return single_search_icon;
+    }
+    
+    protected override Page create_page() {
+        return new SavedSearchPage(search);
+    }
+    
+    public bool is_user_renameable() {
+        return true;
+    }
+    
+    public void rename(string new_name) {
+        if (!SavedSearchTable.get_instance().exists(new_name))
+            AppWindow.get_command_manager().execute(new RenameSavedSearchCommand(search, new_name));
+        else if (new_name != search.get_name())
+            AppWindow.error_message(Resources.rename_search_exists_message(new_name));
+    }
+    
+    public void destroy_source() {
+        if (Dialogs.confirm_delete_saved_search(search))
+            AppWindow.get_command_manager().execute(new DeleteSavedSearchCommand(search));
+    }
+}
-- 
cgit v1.2.3


From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 25 Jun 2018 20:55:59 +0200
Subject: New upstream version 0.28.3

---
 src/searches/SavedSearchDialog.c | 3883 +++++++++++++++++++-----------------
 src/searches/SavedSearchPage.c   |  628 +++---
 src/searches/SearchBoolean.c     | 3997 +++++++++++++++++++-------------------
 src/searches/Searches.c          |   19 +-
 src/searches/SearchesBranch.c    |  658 ++++---
 5 files changed, 4818 insertions(+), 4367 deletions(-)

(limited to 'src/searches')

diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 09e5fec..65e6df1 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -1,4 +1,4 @@
-/* SavedSearchDialog.c generated by valac 0.36.6, the Vala compiler
+/* SavedSearchDialog.c generated by valac 0.40.4, the Vala compiler
  * generated from SavedSearchDialog.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
  */
 /* This dialog displays a boolean search configuration.*/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -68,6 +69,11 @@ typedef struct _DataSourceClass DataSourceClass;
 
 typedef struct _SavedSearch SavedSearch;
 typedef struct _SavedSearchClass SavedSearchClass;
+enum  {
+	SAVED_SEARCH_DIALOG_0_PROPERTY,
+	SAVED_SEARCH_DIALOG_NUM_PROPERTIES
+};
+static GParamSpec* saved_search_dialog_properties[SAVED_SEARCH_DIALOG_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define TYPE_SAVED_SEARCH_TABLE (saved_search_table_get_type ())
@@ -193,9 +199,9 @@ typedef struct _SavedSearchDialogParamSpecSearchRowContainer SavedSearchDialogPa
 enum  {
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL,
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL,
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL
+	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_NUM_SIGNALS
 };
-static guint saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_LAST_SIGNAL] = {0};
+static guint saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_NUM_SIGNALS] = {0};
 typedef struct _SavedSearchDialogSearchRowPrivate SavedSearchDialogSearchRowPrivate;
 typedef struct _SavedSearchDialogParamSpecSearchRow SavedSearchDialogParamSpecSearchRow;
 typedef struct _SavedSearchDialogSearchRowTextPrivate SavedSearchDialogSearchRowTextPrivate;
@@ -554,365 +560,449 @@ static gpointer saved_search_dialog_search_row_date_parent_class = NULL;
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 static gpointer saved_search_dialog_search_row_container_ref (gpointer instance);
 static void saved_search_dialog_search_row_container_unref (gpointer instance);
-static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name,
+                                                                 const gchar* nick,
+                                                                 const gchar* blurb,
+                                                                 GType object_type,
+                                                                 GParamFlags flags) G_GNUC_UNUSED;
+static void saved_search_dialog_value_set_search_row_container (GValue* value,
+                                                         gpointer v_object) G_GNUC_UNUSED;
+static void saved_search_dialog_value_take_search_row_container (GValue* value,
+                                                          gpointer v_object) G_GNUC_UNUSED;
 static gpointer saved_search_dialog_value_get_search_row_container (const GValue* value) G_GNUC_UNUSED;
 static GType saved_search_dialog_search_row_container_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType saved_search_get_type (void) G_GNUC_CONST;
 #define SAVED_SEARCH_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialogPrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_DUMMY_PROPERTY
-};
 SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
 gint resources_use_header_bar (void);
 static void saved_search_dialog_setup_dialog (SavedSearchDialog* self);
 gpointer saved_search_table_ref (gpointer instance);
 void saved_search_table_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_table (GValue* value, gpointer v_object);
-void value_take_saved_search_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_saved_search_table (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_saved_search_table (GValue* value,
+                                   gpointer v_object);
+void value_take_saved_search_table (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_saved_search_table (const GValue* value);
 GType saved_search_table_get_type (void) G_GNUC_CONST;
 SavedSearchTable* saved_search_table_get_instance (void);
 gchar* saved_search_table_generate_unique_name (SavedSearchTable* self);
 static void saved_search_dialog_add_text_search (SavedSearchDialog* self);
-static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow);
-static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v);
+static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self,
+                                                             gboolean allow);
+static void saved_search_dialog_set_valid (SavedSearchDialog* self,
+                                    gboolean v);
 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);
 GType search_operator_get_type (void) G_GNUC_CONST;
 SearchOperator saved_search_get_operator (SavedSearch* self);
 gchar* data_object_get_name (DataObject* self);
 gpointer search_condition_ref (gpointer instance);
 void search_condition_unref (gpointer instance);
-GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_search_condition (GValue* value, gpointer v_object);
-void value_take_search_condition (GValue* value, gpointer v_object);
+GParamSpec* param_spec_search_condition (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags);
+void value_set_search_condition (GValue* value,
+                                 gpointer v_object);
+void value_take_search_condition (GValue* value,
+                                  gpointer v_object);
 gpointer value_get_search_condition (const GValue* value);
 GType search_condition_get_type (void) G_GNUC_CONST;
 GeeList* saved_search_get_conditions (SavedSearch* self);
-static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row);
+static void saved_search_dialog_add_row (SavedSearchDialog* self,
+                                  SavedSearchDialogSearchRowContainer* row);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc);
-static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc);
+static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type,
+                                                                                                       SearchCondition* sc);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
-static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id);
-static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
+static void saved_search_dialog_on_response (SavedSearchDialog* self,
+                                      gint response_id);
+static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender,
+                                                           gint response_id,
+                                                           gpointer self);
 static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self);
-static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender,
+                                                              gpointer self);
 static void saved_search_dialog_on_title_changed (SavedSearchDialog* self);
-static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                 gpointer self);
 void saved_search_dialog_show (SavedSearchDialog* self);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void);
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type);
 static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self);
-static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row);
-static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self);
-static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row);
-static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self);
+static void saved_search_dialog_on_remove_row (SavedSearchDialog* self,
+                                        SavedSearchDialogSearchRowContainer* row);
+static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender,
+                                                                                         SavedSearchDialogSearchRowContainer* this_row,
+                                                                                         gpointer self);
+static void saved_search_dialog_on_row_changed (SavedSearchDialog* self,
+                                         SavedSearchDialogSearchRowContainer* row);
+static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender,
+                                                                                           SavedSearchDialogSearchRowContainer* this_row,
+                                                                                           gpointer self);
 static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self);
-gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+gboolean saved_search_table_exists (SavedSearchTable* self,
+                                    const gchar* search_name);
+void app_window_error_message (const gchar* message,
+                               GtkWindow* parent);
 gchar* resources_rename_search_exists_message (const gchar* name);
-void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search);
+void saved_search_table_remove (SavedSearchTable* self,
+                                SavedSearch* search);
 static SearchCondition* saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self);
-SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions);
+SavedSearch* saved_search_table_create (SavedSearchTable* self,
+                                        const gchar* name,
+                                        SearchOperator operator,
+                                        GeeArrayList* conditions);
 static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self);
 GType search_condition_search_type_get_type (void) G_GNUC_CONST;
 static gpointer saved_search_dialog_search_row_ref (gpointer instance);
 static void saved_search_dialog_search_row_unref (gpointer instance);
-static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name,
+                                                       const gchar* nick,
+                                                       const gchar* blurb,
+                                                       GType object_type,
+                                                       GParamFlags flags) G_GNUC_UNUSED;
+static void saved_search_dialog_value_set_search_row (GValue* value,
+                                               gpointer v_object) G_GNUC_UNUSED;
+static void saved_search_dialog_value_take_search_row (GValue* value,
+                                                gpointer v_object) G_GNUC_UNUSED;
 static gpointer saved_search_dialog_value_get_search_row (const GValue* value) G_GNUC_UNUSED;
 static GType saved_search_dialog_search_row_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainerPrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_DUMMY_PROPERTY
-};
 static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self);
-static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type);
+static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self,
+                                                        SearchConditionSearchType type);
 SearchConditionSearchType search_condition_get_search_type (SearchCondition* self);
-static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType st);
-static void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc);
+static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self,
+                                                                  SearchConditionSearchType st);
+static void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self,
+                                              SearchCondition* sc);
 SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1);
-void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1);
+void search_condition_search_type_sort_array (SearchConditionSearchType** array,
+                                              int* array_length1);
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
 static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self);
-static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                      gpointer self);
 static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self);
-static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender,
+                                                                              gpointer self);
 static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self);
 static GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self);
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent);
-static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent);
+static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type,
+                                                                               SavedSearchDialogSearchRowContainer* parent);
 static GType saved_search_dialog_search_row_text_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent);
-static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent);
+static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type,
+                                                                                          SavedSearchDialogSearchRowContainer* parent);
 static GType saved_search_dialog_search_row_media_type_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent);
-static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent);
+static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type,
+                                                                                     SavedSearchDialogSearchRowContainer* parent);
 static GType saved_search_dialog_search_row_flagged_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent);
-static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent);
+static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type,
+                                                                                       SavedSearchDialogSearchRowContainer* parent);
 static GType saved_search_dialog_search_row_modified_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent);
-static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent);
+static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type,
+                                                                                   SavedSearchDialogSearchRowContainer* parent);
 static GType saved_search_dialog_search_row_rating_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent);
-static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent);
+static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type,
+                                                                               SavedSearchDialogSearchRowContainer* parent);
 static GType saved_search_dialog_search_row_date_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self);
 static gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self);
-static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure,
+                                                                             GValue * return_value,
+                                                                             guint n_param_values,
+                                                                             const GValue * param_values,
+                                                                             gpointer invocation_hint,
+                                                                             gpointer marshal_data);
 static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj);
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_DUMMY_PROPERTY
-};
 static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self);
 static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self);
-static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc);
+static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self,
+                                                   SearchCondition* sc);
 static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self);
 static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type);
 static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowTextPrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_DUMMY_PROPERTY
-};
 static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self);
-static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
+static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                            gpointer self);
+static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                           gpointer self);
 static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base);
 static SearchCondition* saved_search_dialog_search_row_text_real_get_search_condition (SavedSearchDialogSearchRow* base);
 GType search_condition_text_context_get_type (void) G_GNUC_CONST;
 static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self);
 GType search_condition_text_get_type (void) G_GNUC_CONST;
-SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context);
-SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context);
-static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc);
+SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type,
+                                                const gchar* text,
+                                                SearchConditionTextContext context);
+SearchConditionText* search_condition_text_construct (GType object_type,
+                                                      SearchConditionSearchType search_type,
+                                                      const gchar* text,
+                                                      SearchConditionTextContext context);
+static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base,
+                                                        SearchCondition* sc);
 SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self);
 const gchar* search_condition_text_get_text (SearchConditionText* self);
 static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base);
 static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaTypePrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_DUMMY_PROPERTY
-};
 static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self);
-static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                  gpointer self);
 static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base);
 static SearchCondition* saved_search_dialog_search_row_media_type_real_get_search_condition (SavedSearchDialogSearchRow* base);
 GType search_condition_media_type_context_get_type (void) G_GNUC_CONST;
 GType search_condition_media_type_media_type_get_type (void) G_GNUC_CONST;
 GType search_condition_media_type_get_type (void) G_GNUC_CONST;
-SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type);
-SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type);
-static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc);
+SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type,
+                                                           SearchConditionMediaTypeContext context,
+                                                           SearchConditionMediaTypeMediaType media_type);
+SearchConditionMediaType* search_condition_media_type_construct (GType object_type,
+                                                                 SearchConditionSearchType search_type,
+                                                                 SearchConditionMediaTypeContext context,
+                                                                 SearchConditionMediaTypeMediaType media_type);
+static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base,
+                                                              SearchCondition* sc);
 SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self);
 SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self);
 static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base);
 static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModifiedPrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_DUMMY_PROPERTY
-};
 static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self);
-static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                gpointer self);
 static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base);
 static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_condition (SavedSearchDialogSearchRow* base);
 GType search_condition_modified_context_get_type (void) G_GNUC_CONST;
 GType search_condition_modified_state_get_type (void) G_GNUC_CONST;
 GType search_condition_modified_get_type (void) G_GNUC_CONST;
-SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state);
-SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state);
-static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc);
+SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type,
+                                                        SearchConditionModifiedContext context,
+                                                        SearchConditionModifiedState state);
+SearchConditionModified* search_condition_modified_construct (GType object_type,
+                                                              SearchConditionSearchType search_type,
+                                                              SearchConditionModifiedContext context,
+                                                              SearchConditionModifiedState state);
+static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base,
+                                                            SearchCondition* sc);
 SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self);
 SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self);
 static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base);
 static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlaggedPrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_DUMMY_PROPERTY
-};
 static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self);
-static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                               gpointer self);
 static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base);
 static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_condition (SavedSearchDialogSearchRow* base);
 GType search_condition_flagged_state_get_type (void) G_GNUC_CONST;
 GType search_condition_flagged_get_type (void) G_GNUC_CONST;
-SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state);
-SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state);
-static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc);
+SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type,
+                                                      SearchConditionFlaggedState state);
+SearchConditionFlagged* search_condition_flagged_construct (GType object_type,
+                                                            SearchConditionSearchType search_type,
+                                                            SearchConditionFlaggedState state);
+static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base,
+                                                           SearchCondition* sc);
 SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self);
 static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base);
 static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRatingPrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_DUMMY_PROPERTY
-};
 static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self);
-static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                              gpointer self);
 GType rating_get_type (void) G_GNUC_CONST;
 const gchar* resources_rating_combo_box (Rating rating);
 static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base);
 static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_condition (SavedSearchDialogSearchRow* base);
 GType search_condition_rating_context_get_type (void) G_GNUC_CONST;
 GType search_condition_rating_get_type (void) G_GNUC_CONST;
-SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context);
-SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context);
-static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc);
+SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type,
+                                                    Rating rating,
+                                                    SearchConditionRatingContext context);
+SearchConditionRating* search_condition_rating_construct (GType object_type,
+                                                          SearchConditionSearchType search_type,
+                                                          Rating rating,
+                                                          SearchConditionRatingContext context);
+static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base,
+                                                          SearchCondition* sc);
 SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self);
 Rating search_condition_rating_get_rating (SearchConditionRating* self);
 static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base);
 static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDatePrivate))
-enum  {
-	SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DUMMY_PROPERTY
-};
 static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self);
-static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                            gpointer self);
 #define SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT "%x"
 static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self);
-static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                             gpointer self);
 static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self);
-static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                             gpointer self);
 static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self);
 GType search_condition_date_context_get_type (void) G_GNUC_CONST;
 static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self);
 static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self);
 static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base);
-static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, GDateTime* date);
-static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, GDateTime* date);
+static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self,
+                                                       GDateTime* date);
+static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self,
+                                                       GDateTime* date);
 static SearchCondition* saved_search_dialog_search_row_date_real_get_search_condition (SavedSearchDialogSearchRow* base);
 GType search_condition_date_get_type (void) G_GNUC_CONST;
-SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two);
-SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two);
-static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc);
+SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type,
+                                                SearchConditionDateContext context,
+                                                GDateTime* date_one,
+                                                GDateTime* date_two);
+SearchConditionDate* search_condition_date_construct (GType object_type,
+                                                      SearchConditionSearchType search_type,
+                                                      SearchConditionDateContext context,
+                                                      GDateTime* date_one,
+                                                      GDateTime* date_two);
+static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base,
+                                                        SearchCondition* sc);
 SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self);
 GDateTime* search_condition_date_get_date_one (SearchConditionDate* self);
 GDateTime* search_condition_date_get_date_two (SearchConditionDate* self);
 static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base);
-static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal);
+static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self,
+                                                         GtkCalendar* cal);
 static Block10Data* block10_data_ref (Block10Data* _data10_);
 static void block10_data_unref (void * _userdata_);
 #define RESOURCES_CANCEL_LABEL _ ("_Cancel")
 #define RESOURCES_OK_LABEL _ ("_OK")
 static void __lambda14_ (SavedSearchDialogSearchRowDate* self);
-static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self);
+static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender,
+                                             gpointer self);
 static void __lambda15_ (Block10Data* _data10_);
-static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self);
+static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender,
+                                                          gpointer self);
 static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj);
 static void saved_search_dialog_finalize (GObject * obj);
 
 
-SavedSearchDialog* saved_search_dialog_construct (GType object_type) {
+SavedSearchDialog*
+saved_search_dialog_construct (GType object_type)
+{
 	SavedSearchDialog * self = NULL;
-	gint _tmp0_;
-	GtkEntry* _tmp1_;
+	GtkEntry* _tmp0_;
+	SavedSearchTable* _tmp1_;
 	SavedSearchTable* _tmp2_;
-	SavedSearchTable* _tmp3_;
+	gchar* _tmp3_;
 	gchar* _tmp4_;
-	gchar* _tmp5_;
-	GtkEntry* _tmp6_;
-	GeeArrayList* _tmp7_;
-	gpointer _tmp8_;
-	SavedSearchDialogSearchRowContainer* _tmp9_;
-#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = resources_use_header_bar ();
+	GtkEntry* _tmp5_;
+	GeeArrayList* _tmp6_;
+	gpointer _tmp7_;
+	SavedSearchDialogSearchRowContainer* _tmp8_;
 #line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
+	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
 #line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_setup_dialog (self);
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = self->priv->search_title;
+	_tmp0_ = self->priv->search_title;
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = saved_search_table_get_instance ();
+	_tmp1_ = saved_search_table_get_instance ();
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = saved_search_table_generate_unique_name (_tmp3_);
+	_tmp3_ = saved_search_table_generate_unique_name (_tmp2_);
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_text (_tmp1_, _tmp5_);
+	gtk_entry_set_text (_tmp0_, _tmp4_);
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_free0 (_tmp5_);
+	_g_free0 (_tmp4_);
 #line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_saved_search_table_unref0 (_tmp3_);
+	_saved_search_table_unref0 (_tmp2_);
 #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->search_title;
+	_tmp5_ = self->priv->search_title;
 #line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1);
+	gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_editable_get_type (), GtkEditable), 0, -1);
 #line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_text_search (self);
 #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->row_list;
+	_tmp6_ = self->priv->row_list;
 #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+	_tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
 #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = (SavedSearchDialogSearchRowContainer*) _tmp8_;
+	_tmp8_ = (SavedSearchDialogSearchRowContainer*) _tmp7_;
 #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_allow_removal (_tmp9_, FALSE);
+	saved_search_dialog_search_row_container_allow_removal (_tmp8_, FALSE);
 #line 667 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_saved_search_dialog_search_row_container_unref0 (_tmp9_);
+	_saved_search_dialog_search_row_container_unref0 (_tmp8_);
 #line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, FALSE);
 #line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 870 "SavedSearchDialog.c"
+#line 962 "SavedSearchDialog.c"
 }
 
 
-SavedSearchDialog* saved_search_dialog_new (void) {
+SavedSearchDialog*
+saved_search_dialog_new (void)
+{
 #line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG);
-#line 877 "SavedSearchDialog.c"
+#line 971 "SavedSearchDialog.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 884 "SavedSearchDialog.c"
+#line 980 "SavedSearchDialog.c"
 }
 
 
-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)
+{
 	SavedSearchDialog * self = NULL;
-	gint _tmp0_;
-	SavedSearch* _tmp1_;
-	SavedSearch* _tmp2_;
-	GtkComboBoxText* _tmp3_;
-	SavedSearch* _tmp4_;
-	SearchOperator _tmp5_;
-	GtkEntry* _tmp6_;
-	SavedSearch* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	GeeArrayList* _tmp24_;
-	gint _tmp25_;
-	gint _tmp26_;
+	SavedSearch* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	GtkEntry* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	GeeArrayList* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL);
 #line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = resources_use_header_bar ();
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", _tmp0_, NULL);
-#line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search;
+	self = (SavedSearchDialog*) g_object_new (object_type, "use-header-bar", resources_use_header_bar (), NULL);
 #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp0_ = _g_object_ref0 (saved_search);
 #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
 #line 676 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->previous_search = _tmp2_;
+	self->priv->previous_search = _tmp0_;
 #line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->edit_mode = TRUE;
 #line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -920,165 +1010,170 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 #line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->operator;
+	_tmp1_ = self->priv->operator;
 #line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = saved_search;
-#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = saved_search_get_operator (_tmp4_);
-#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) _tmp5_));
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) saved_search_get_operator (saved_search)));
 #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->search_title;
+	_tmp2_ = self->priv->search_title;
 #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = saved_search;
+	_tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (saved_search, TYPE_DATA_OBJECT, DataObject));
 #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = _tmp8_;
+	_tmp4_ = _tmp3_;
 #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_text (_tmp6_, _tmp9_);
+	gtk_entry_set_text (_tmp2_, _tmp4_);
 #line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_free0 (_tmp9_);
-#line 943 "SavedSearchDialog.c"
+	_g_free0 (_tmp4_);
+#line 1027 "SavedSearchDialog.c"
 	{
 		GeeList* _sc_list = NULL;
-		SavedSearch* _tmp10_;
-		GeeList* _tmp11_;
+		GeeList* _tmp5_;
 		gint _sc_size = 0;
-		GeeList* _tmp12_;
-		gint _tmp13_;
-		gint _tmp14_;
+		GeeList* _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 		gint _sc_index = 0;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp10_ = saved_search;
-#line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp11_ = saved_search_get_conditions (_tmp10_);
+		_tmp5_ = saved_search_get_conditions (saved_search);
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_sc_list = _tmp11_;
+		_sc_list = _tmp5_;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp12_ = _sc_list;
+		_tmp6_ = _sc_list;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp14_ = _tmp13_;
+		_tmp8_ = _tmp7_;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_sc_size = _tmp14_;
+		_sc_size = _tmp8_;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_index = -1;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		while (TRUE) {
-#line 971 "SavedSearchDialog.c"
-			gint _tmp15_;
-			gint _tmp16_;
-			gint _tmp17_;
+#line 1052 "SavedSearchDialog.c"
+			gint _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 			SearchCondition* sc = NULL;
-			GeeList* _tmp18_;
-			gint _tmp19_;
-			gpointer _tmp20_;
-			SearchCondition* _tmp21_;
-			SavedSearchDialogSearchRowContainer* _tmp22_;
-			SavedSearchDialogSearchRowContainer* _tmp23_;
+			GeeList* _tmp12_;
+			gint _tmp13_;
+			gpointer _tmp14_;
+			SearchCondition* _tmp15_;
+			SavedSearchDialogSearchRowContainer* _tmp16_;
+			SavedSearchDialogSearchRowContainer* _tmp17_;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp15_ = _sc_index;
+			_tmp9_ = _sc_index;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_sc_index = _tmp15_ + 1;
+			_sc_index = _tmp9_ + 1;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp16_ = _sc_index;
+			_tmp10_ = _sc_index;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp17_ = _sc_size;
+			_tmp11_ = _sc_size;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			if (!(_tmp16_ < _tmp17_)) {
+			if (!(_tmp10_ < _tmp11_)) {
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				break;
-#line 994 "SavedSearchDialog.c"
+#line 1075 "SavedSearchDialog.c"
 			}
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp18_ = _sc_list;
+			_tmp12_ = _sc_list;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp19_ = _sc_index;
+			_tmp13_ = _sc_index;
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp20_ = gee_list_get (_tmp18_, _tmp19_);
+			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			sc = (SearchCondition*) _tmp20_;
+			sc = (SearchCondition*) _tmp14_;
 #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp21_ = sc;
+			_tmp15_ = sc;
 #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp22_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp21_);
+			_tmp16_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp15_);
 #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp23_ = _tmp22_;
+			_tmp17_ = _tmp16_;
 #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			saved_search_dialog_add_row (self, _tmp23_);
+			saved_search_dialog_add_row (self, _tmp17_);
 #line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_saved_search_dialog_search_row_container_unref0 (_tmp23_);
+			_saved_search_dialog_search_row_container_unref0 (_tmp17_);
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_search_condition_unref0 (sc);
-#line 1016 "SavedSearchDialog.c"
+#line 1097 "SavedSearchDialog.c"
 		}
 #line 685 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_sc_list);
-#line 1020 "SavedSearchDialog.c"
+#line 1101 "SavedSearchDialog.c"
 	}
 #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->row_list;
+	_tmp18_ = self->priv->row_list;
 #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = _tmp25_;
+	_tmp20_ = _tmp19_;
 #line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp26_ == 1) {
-#line 1030 "SavedSearchDialog.c"
-		GeeArrayList* _tmp27_;
-		gpointer _tmp28_;
-		SavedSearchDialogSearchRowContainer* _tmp29_;
+	if (_tmp20_ == 1) {
+#line 1111 "SavedSearchDialog.c"
+		GeeArrayList* _tmp21_;
+		gpointer _tmp22_;
+		SavedSearchDialogSearchRowContainer* _tmp23_;
 #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp27_ = self->priv->row_list;
+		_tmp21_ = self->priv->row_list;
 #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+		_tmp22_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
 #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp29_ = (SavedSearchDialogSearchRowContainer*) _tmp28_;
+		_tmp23_ = (SavedSearchDialogSearchRowContainer*) _tmp22_;
 #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE);
+		saved_search_dialog_search_row_container_allow_removal (_tmp23_, FALSE);
 #line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_saved_search_dialog_search_row_container_unref0 (_tmp29_);
-#line 1044 "SavedSearchDialog.c"
+		_saved_search_dialog_search_row_container_unref0 (_tmp23_);
+#line 1125 "SavedSearchDialog.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 1050 "SavedSearchDialog.c"
+#line 1131 "SavedSearchDialog.c"
 }
 
 
-SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) {
+SavedSearchDialog*
+saved_search_dialog_new_edit_existing (SavedSearch* saved_search)
+{
 #line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search);
-#line 1057 "SavedSearchDialog.c"
+#line 1140 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+static void
+_saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender,
+                                                      gint response_id,
+                                                      gpointer self)
+{
 #line 698 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id);
-#line 1064 "SavedSearchDialog.c"
+#line 1151 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_saved_search_dialog_on_add_criteria_gtk_button_clicked (GtkButton* _sender,
+                                                         gpointer self)
+{
 #line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self);
-#line 1071 "SavedSearchDialog.c"
+#line 1161 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                            gpointer self)
+{
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_title_changed ((SavedSearchDialog*) self);
-#line 1078 "SavedSearchDialog.c"
+#line 1171 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) {
+static void
+saved_search_dialog_setup_dialog (SavedSearchDialog* self)
+{
 	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
 	GtkButton* _tmp2_;
@@ -1102,32 +1197,38 @@ static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) {
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->search_title;
 #line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self, 0);
-#line 1107 "SavedSearchDialog.c"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self, 0);
+#line 1202 "SavedSearchDialog.c"
 }
 
 
-void saved_search_dialog_show (SavedSearchDialog* self) {
+void
+saved_search_dialog_show (SavedSearchDialog* self)
+{
 #line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1118 "SavedSearchDialog.c"
+#line 1215 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_on_add_criteria (SavedSearchDialog* self) {
+static void
+saved_search_dialog_on_add_criteria (SavedSearchDialog* self)
+{
 #line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_text_search (self);
-#line 1127 "SavedSearchDialog.c"
+#line 1226 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_add_text_search (SavedSearchDialog* self) {
+static void
+saved_search_dialog_add_text_search (SavedSearchDialog* self)
+{
 	SavedSearchDialogSearchRowContainer* text = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1140,38 +1241,43 @@ static void saved_search_dialog_add_text_search (SavedSearchDialog* self) {
 	saved_search_dialog_add_row (self, text);
 #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (text);
-#line 1144 "SavedSearchDialog.c"
+#line 1245 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
+static void
+_saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender,
+                                                                                    SavedSearchDialogSearchRowContainer* this_row,
+                                                                                    gpointer self)
+{
 #line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row);
-#line 1151 "SavedSearchDialog.c"
+#line 1256 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
+static void
+_saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender,
+                                                                                      SavedSearchDialogSearchRowContainer* this_row,
+                                                                                      gpointer self)
+{
 #line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row);
-#line 1158 "SavedSearchDialog.c"
+#line 1267 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
+static void
+saved_search_dialog_add_row (SavedSearchDialog* self,
+                             SavedSearchDialogSearchRowContainer* row)
+{
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
 	GtkListBox* _tmp6_;
-	SavedSearchDialogSearchRowContainer* _tmp7_;
+	GtkWidget* _tmp7_;
 	GtkWidget* _tmp8_;
-	GtkWidget* _tmp9_;
-	GeeArrayList* _tmp10_;
-	SavedSearchDialogSearchRowContainer* _tmp11_;
-	SavedSearchDialogSearchRowContainer* _tmp12_;
-	SavedSearchDialogSearchRowContainer* _tmp13_;
-	SavedSearchDialogSearchRowContainer* _tmp14_;
-	gboolean _tmp15_;
+	GeeArrayList* _tmp9_;
 #line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1184,7 +1290,7 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	_tmp2_ = _tmp1_;
 #line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == 1) {
-#line 1188 "SavedSearchDialog.c"
+#line 1294 "SavedSearchDialog.c"
 		GeeArrayList* _tmp3_;
 		gpointer _tmp4_;
 		SavedSearchDialogSearchRowContainer* _tmp5_;
@@ -1198,427 +1304,400 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 		saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE);
 #line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp5_);
-#line 1202 "SavedSearchDialog.c"
+#line 1308 "SavedSearchDialog.c"
 	}
 #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->row_listbox;
 #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = row;
+	_tmp7_ = saved_search_dialog_search_row_container_get_widget (row);
 #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = saved_search_dialog_search_row_container_get_widget (_tmp7_);
-#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp9_);
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp8_);
 #line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->row_list;
-#line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = row;
+	_tmp9_ = self->priv->row_list;
 #line 726 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), row);
 #line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = row;
-#line 727 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect_object (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self, 0);
-#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = row;
+	g_signal_connect_object (row, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self, 0);
 #line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect_object (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self, 0);
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = row;
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_);
+	g_signal_connect_object (row, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self, 0);
 #line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_set_valid (self, _tmp15_);
-#line 1236 "SavedSearchDialog.c"
+	saved_search_dialog_set_valid (self, saved_search_dialog_search_row_container_is_complete (row));
+#line 1330 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
-	SavedSearchDialogSearchRowContainer* _tmp0_;
+static void
+saved_search_dialog_on_remove_row (SavedSearchDialog* self,
+                                   SavedSearchDialogSearchRowContainer* row)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	SavedSearchDialogSearchRowContainer* _tmp2_;
-	guint _tmp3_;
-	GtkListBox* _tmp4_;
-	SavedSearchDialogSearchRowContainer* _tmp5_;
-	GtkWidget* _tmp6_;
-	GtkWidget* _tmp7_;
-	GtkContainer* _tmp8_;
-	GeeArrayList* _tmp9_;
-	SavedSearchDialogSearchRowContainer* _tmp10_;
-	GeeArrayList* _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
+	GtkListBox* _tmp2_;
+	GtkWidget* _tmp3_;
+	GtkWidget* _tmp4_;
+	GtkContainer* _tmp5_;
+	GeeArrayList* _tmp6_;
+	GeeArrayList* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 #line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 733 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
 #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = row;
+	g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp0_, NULL, FALSE);
 #line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE);
-#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
-#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = row;
+	g_signal_handlers_disconnect_matched (row, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
 #line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE);
 #line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
+	g_signal_handlers_disconnect_matched (row, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
 #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->row_listbox;
+	_tmp2_ = self->priv->row_listbox;
 #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = row;
+	_tmp3_ = saved_search_dialog_search_row_container_get_widget (row);
 #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = saved_search_dialog_search_row_container_get_widget (_tmp5_);
-#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = _tmp3_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = (GtkContainer*) gtk_widget_get_parent (_tmp7_);
+	_tmp5_ = gtk_widget_get_parent (_tmp4_);
 #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
 #line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp7_);
-#line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->row_list;
+	_g_object_unref0 (_tmp4_);
 #line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = row;
+	_tmp6_ = self->priv->row_list;
 #line 737 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
+	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), row);
 #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->row_list;
+	_tmp7_ = self->priv->row_list;
 #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = _tmp12_;
+	_tmp9_ = _tmp8_;
 #line 738 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp13_ == 1) {
-#line 1299 "SavedSearchDialog.c"
-		GeeArrayList* _tmp14_;
-		gpointer _tmp15_;
-		SavedSearchDialogSearchRowContainer* _tmp16_;
+	if (_tmp9_ == 1) {
+#line 1384 "SavedSearchDialog.c"
+		GeeArrayList* _tmp10_;
+		gpointer _tmp11_;
+		SavedSearchDialogSearchRowContainer* _tmp12_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp14_ = self->priv->row_list;
+		_tmp10_ = self->priv->row_list;
 #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+		_tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
 #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp16_ = (SavedSearchDialogSearchRowContainer*) _tmp15_;
+		_tmp12_ = (SavedSearchDialogSearchRowContainer*) _tmp11_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		saved_search_dialog_search_row_container_allow_removal (_tmp16_, FALSE);
+		saved_search_dialog_search_row_container_allow_removal (_tmp12_, FALSE);
 #line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_saved_search_dialog_search_row_container_unref0 (_tmp16_);
-#line 1313 "SavedSearchDialog.c"
+		_saved_search_dialog_search_row_container_unref0 (_tmp12_);
+#line 1398 "SavedSearchDialog.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 1317 "SavedSearchDialog.c"
+#line 1402 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) {
-	gint _tmp0_;
+static void
+saved_search_dialog_on_response (SavedSearchDialog* self,
+                                 gint response_id)
+{
 #line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = response_id;
-#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 1329 "SavedSearchDialog.c"
-		gboolean _tmp1_ = FALSE;
+	if (response_id == ((gint) GTK_RESPONSE_OK)) {
+#line 1414 "SavedSearchDialog.c"
+		gboolean _tmp0_ = FALSE;
+		SavedSearchTable* _tmp1_;
 		SavedSearchTable* _tmp2_;
-		SavedSearchTable* _tmp3_;
-		GtkEntry* _tmp4_;
-		const gchar* _tmp5_;
-		gboolean _tmp6_;
-		gboolean _tmp7_;
-		gboolean _tmp19_;
+		GtkEntry* _tmp3_;
+		const gchar* _tmp4_;
+		gboolean _tmp5_;
+		gboolean _tmp17_;
 		GeeArrayList* conditions = NULL;
-		GeeArrayList* _tmp23_;
+		GeeArrayList* _tmp21_;
 		SearchOperator search_operator = 0;
-		GtkComboBoxText* _tmp39_;
-		gint _tmp40_;
-		SavedSearchTable* _tmp41_;
-		SavedSearchTable* _tmp42_;
-		GtkEntry* _tmp43_;
-		const gchar* _tmp44_;
-		SearchOperator _tmp45_;
-		GeeArrayList* _tmp46_;
-		SavedSearch* _tmp47_;
-		SavedSearch* _tmp48_;
+		GtkComboBoxText* _tmp37_;
+		SavedSearchTable* _tmp38_;
+		SavedSearchTable* _tmp39_;
+		GtkEntry* _tmp40_;
+		const gchar* _tmp41_;
+		SearchOperator _tmp42_;
+		GeeArrayList* _tmp43_;
+		SavedSearch* _tmp44_;
+		SavedSearch* _tmp45_;
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp2_ = saved_search_table_get_instance ();
+		_tmp1_ = saved_search_table_get_instance ();
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp4_ = self->priv->search_title;
+		_tmp3_ = self->priv->search_title;
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp5_ = gtk_entry_get_text (_tmp4_);
+		_tmp4_ = gtk_entry_get_text (_tmp3_);
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp6_ = saved_search_table_exists (_tmp3_, _tmp5_);
+		_tmp5_ = saved_search_table_exists (_tmp2_, _tmp4_);
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp7_ = _tmp6_;
+		_saved_search_table_unref0 (_tmp2_);
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_saved_search_table_unref0 (_tmp3_);
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		if (_tmp7_) {
-#line 1367 "SavedSearchDialog.c"
-			gboolean _tmp8_ = FALSE;
-			gboolean _tmp9_;
+		if (_tmp5_) {
+#line 1448 "SavedSearchDialog.c"
+			gboolean _tmp6_ = FALSE;
+			gboolean _tmp7_;
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp9_ = self->priv->edit_mode;
+			_tmp7_ = self->priv->edit_mode;
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			if (_tmp9_) {
-#line 1374 "SavedSearchDialog.c"
-				SavedSearch* _tmp10_;
-				gchar* _tmp11_;
-				gchar* _tmp12_;
-				GtkEntry* _tmp13_;
-				const gchar* _tmp14_;
+			if (_tmp7_) {
+#line 1455 "SavedSearchDialog.c"
+				SavedSearch* _tmp8_;
+				gchar* _tmp9_;
+				gchar* _tmp10_;
+				GtkEntry* _tmp11_;
+				const gchar* _tmp12_;
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp10_ = self->priv->previous_search;
+				_tmp8_ = self->priv->previous_search;
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp11_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
+				_tmp9_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp12_ = _tmp11_;
+				_tmp10_ = _tmp9_;
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp13_ = self->priv->search_title;
+				_tmp11_ = self->priv->search_title;
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp14_ = gtk_entry_get_text (_tmp13_);
+				_tmp12_ = gtk_entry_get_text (_tmp11_);
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0;
+				_tmp6_ = g_strcmp0 (_tmp10_, _tmp12_) == 0;
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_g_free0 (_tmp12_);
-#line 1394 "SavedSearchDialog.c"
+				_g_free0 (_tmp10_);
+#line 1475 "SavedSearchDialog.c"
 			} else {
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp8_ = FALSE;
-#line 1398 "SavedSearchDialog.c"
+				_tmp6_ = FALSE;
+#line 1479 "SavedSearchDialog.c"
 			}
 #line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp1_ = !_tmp8_;
-#line 1402 "SavedSearchDialog.c"
+			_tmp0_ = !_tmp6_;
+#line 1483 "SavedSearchDialog.c"
 		} else {
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp1_ = FALSE;
-#line 1406 "SavedSearchDialog.c"
+			_tmp0_ = FALSE;
+#line 1487 "SavedSearchDialog.c"
 		}
 #line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		if (_tmp1_) {
-#line 1410 "SavedSearchDialog.c"
-			GtkEntry* _tmp15_;
-			const gchar* _tmp16_;
-			gchar* _tmp17_;
-			gchar* _tmp18_;
+		if (_tmp0_) {
+#line 1491 "SavedSearchDialog.c"
+			GtkEntry* _tmp13_;
+			const gchar* _tmp14_;
+			gchar* _tmp15_;
+			gchar* _tmp16_;
 #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp15_ = self->priv->search_title;
+			_tmp13_ = self->priv->search_title;
 #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp16_ = gtk_entry_get_text (_tmp15_);
+			_tmp14_ = gtk_entry_get_text (_tmp13_);
 #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
+			_tmp15_ = resources_rename_search_exists_message (_tmp14_);
 #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp18_ = _tmp17_;
+			_tmp16_ = _tmp15_;
 #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			app_window_error_message (_tmp18_, NULL);
+			app_window_error_message (_tmp16_, NULL);
 #line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_g_free0 (_tmp18_);
+			_g_free0 (_tmp16_);
 #line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return;
-#line 1429 "SavedSearchDialog.c"
+#line 1510 "SavedSearchDialog.c"
 		}
 #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp19_ = self->priv->edit_mode;
+		_tmp17_ = self->priv->edit_mode;
 #line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		if (_tmp19_) {
-#line 1435 "SavedSearchDialog.c"
-			SavedSearchTable* _tmp20_;
-			SavedSearchTable* _tmp21_;
-			SavedSearch* _tmp22_;
+		if (_tmp17_) {
+#line 1516 "SavedSearchDialog.c"
+			SavedSearchTable* _tmp18_;
+			SavedSearchTable* _tmp19_;
+			SavedSearch* _tmp20_;
 #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp20_ = saved_search_table_get_instance ();
+			_tmp18_ = saved_search_table_get_instance ();
 #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp21_ = _tmp20_;
+			_tmp19_ = _tmp18_;
 #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp22_ = self->priv->previous_search;
+			_tmp20_ = self->priv->previous_search;
 #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			saved_search_table_remove (_tmp21_, _tmp22_);
+			saved_search_table_remove (_tmp19_, _tmp20_);
 #line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_saved_search_table_unref0 (_tmp21_);
-#line 1449 "SavedSearchDialog.c"
+			_saved_search_table_unref0 (_tmp19_);
+#line 1530 "SavedSearchDialog.c"
 		}
 #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
+		_tmp21_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, (GDestroyNotify) search_condition_unref, NULL, NULL, NULL);
 #line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		conditions = _tmp23_;
-#line 1455 "SavedSearchDialog.c"
+		conditions = _tmp21_;
+#line 1536 "SavedSearchDialog.c"
 		{
 			GeeArrayList* _c_list = NULL;
-			GeeArrayList* _tmp24_;
-			GeeArrayList* _tmp25_;
+			GeeArrayList* _tmp22_;
+			GeeArrayList* _tmp23_;
 			gint _c_size = 0;
-			GeeArrayList* _tmp26_;
-			gint _tmp27_;
-			gint _tmp28_;
+			GeeArrayList* _tmp24_;
+			gint _tmp25_;
+			gint _tmp26_;
 			gint _c_index = 0;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp24_ = self->priv->row_list;
+			_tmp22_ = self->priv->row_list;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp25_ = _g_object_ref0 (_tmp24_);
+			_tmp23_ = _g_object_ref0 (_tmp22_);
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_c_list = _tmp25_;
+			_c_list = _tmp23_;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp26_ = _c_list;
+			_tmp24_ = _c_list;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+			_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp28_ = _tmp27_;
+			_tmp26_ = _tmp25_;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_c_size = _tmp28_;
+			_c_size = _tmp26_;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_index = -1;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 1483 "SavedSearchDialog.c"
+#line 1564 "SavedSearchDialog.c"
+				gint _tmp27_;
+				gint _tmp28_;
 				gint _tmp29_;
-				gint _tmp30_;
-				gint _tmp31_;
 				SavedSearchDialogSearchRowContainer* c = NULL;
-				GeeArrayList* _tmp32_;
-				gint _tmp33_;
-				gpointer _tmp34_;
-				GeeArrayList* _tmp35_;
-				SavedSearchDialogSearchRowContainer* _tmp36_;
-				SearchCondition* _tmp37_;
-				SearchCondition* _tmp38_;
+				GeeArrayList* _tmp30_;
+				gint _tmp31_;
+				gpointer _tmp32_;
+				GeeArrayList* _tmp33_;
+				SavedSearchDialogSearchRowContainer* _tmp34_;
+				SearchCondition* _tmp35_;
+				SearchCondition* _tmp36_;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp29_ = _c_index;
+				_tmp27_ = _c_index;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_c_index = _tmp29_ + 1;
+				_c_index = _tmp27_ + 1;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp30_ = _c_index;
+				_tmp28_ = _c_index;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp31_ = _c_size;
+				_tmp29_ = _c_size;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				if (!(_tmp30_ < _tmp31_)) {
+				if (!(_tmp28_ < _tmp29_)) {
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 1507 "SavedSearchDialog.c"
+#line 1588 "SavedSearchDialog.c"
 				}
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp32_ = _c_list;
+				_tmp30_ = _c_list;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp33_ = _c_index;
+				_tmp31_ = _c_index;
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp34_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp33_);
+				_tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp31_);
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				c = (SavedSearchDialogSearchRowContainer*) _tmp34_;
+				c = (SavedSearchDialogSearchRowContainer*) _tmp32_;
 #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp35_ = conditions;
+				_tmp33_ = conditions;
 #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp36_ = c;
+				_tmp34_ = c;
 #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp37_ = saved_search_dialog_search_row_container_get_search_condition (_tmp36_);
+				_tmp35_ = saved_search_dialog_search_row_container_get_search_condition (_tmp34_);
 #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp38_ = _tmp37_;
+				_tmp36_ = _tmp35_;
 #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp36_);
 #line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_search_condition_unref0 (_tmp38_);
+				_search_condition_unref0 (_tmp36_);
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_saved_search_dialog_search_row_container_unref0 (c);
-#line 1531 "SavedSearchDialog.c"
+#line 1612 "SavedSearchDialog.c"
 			}
 #line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_object_unref0 (_c_list);
-#line 1535 "SavedSearchDialog.c"
+#line 1616 "SavedSearchDialog.c"
 		}
 #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp39_ = self->priv->operator;
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp40_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox));
+		_tmp37_ = self->priv->operator;
 #line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		search_operator = (SearchOperator) _tmp40_;
+		search_operator = (SearchOperator) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_combo_box_get_type (), GtkComboBox));
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp41_ = saved_search_table_get_instance ();
+		_tmp38_ = saved_search_table_get_instance ();
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp42_ = _tmp41_;
+		_tmp39_ = _tmp38_;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp43_ = self->priv->search_title;
+		_tmp40_ = self->priv->search_title;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp44_ = gtk_entry_get_text (_tmp43_);
+		_tmp41_ = gtk_entry_get_text (_tmp40_);
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp45_ = search_operator;
+		_tmp42_ = search_operator;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp46_ = conditions;
+		_tmp43_ = conditions;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp47_ = saved_search_table_create (_tmp42_, _tmp44_, _tmp45_, _tmp46_);
+		_tmp44_ = saved_search_table_create (_tmp39_, _tmp41_, _tmp42_, _tmp43_);
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp48_ = _tmp47_;
+		_tmp45_ = _tmp44_;
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_g_object_unref0 (_tmp48_);
+		_g_object_unref0 (_tmp45_);
 #line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_saved_search_table_unref0 (_tmp42_);
+		_saved_search_table_unref0 (_tmp39_);
 #line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (conditions);
-#line 1565 "SavedSearchDialog.c"
+#line 1644 "SavedSearchDialog.c"
 	}
 }
 
 
-static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
-	SavedSearchDialogSearchRowContainer* _tmp0_;
-	gboolean _tmp1_;
+static void
+saved_search_dialog_on_row_changed (SavedSearchDialog* self,
+                                    SavedSearchDialogSearchRowContainer* row)
+{
 #line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
 #line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = row;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_);
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_set_valid (self, _tmp1_);
-#line 1583 "SavedSearchDialog.c"
+	saved_search_dialog_set_valid (self, saved_search_dialog_search_row_container_is_complete (row));
+#line 1659 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) {
-	gboolean _tmp0_;
+static void
+saved_search_dialog_on_title_changed (SavedSearchDialog* self)
+{
 #line 772 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = saved_search_dialog_is_title_valid (self);
-#line 773 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_set_valid (self, _tmp0_);
-#line 1595 "SavedSearchDialog.c"
+	saved_search_dialog_set_valid (self, saved_search_dialog_is_title_valid (self));
+#line 1670 "SavedSearchDialog.c"
 }
 
 
-static gchar* string_chomp (const gchar* self) {
+static gchar*
+string_chomp (const gchar* self)
+{
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_;
 	const gchar* _tmp1_;
-#line 1218 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1219 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1233 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1220 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_strchomp (_tmp1_);
-#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1221 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 1618 "SavedSearchDialog.c"
+#line 1695 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
+static gboolean
+saved_search_dialog_is_title_valid (SavedSearchDialog* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
@@ -1633,28 +1712,27 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 	GtkEntry* _tmp16_;
 	const gchar* _tmp17_;
 	gboolean _tmp18_;
-	gboolean _tmp19_;
 #line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->edit_mode;
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_) {
-#line 1644 "SavedSearchDialog.c"
+#line 1722 "SavedSearchDialog.c"
 		SavedSearch* _tmp3_;
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->previous_search;
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1650 "SavedSearchDialog.c"
+#line 1728 "SavedSearchDialog.c"
 	} else {
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = FALSE;
-#line 1654 "SavedSearchDialog.c"
+#line 1732 "SavedSearchDialog.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 1658 "SavedSearchDialog.c"
+#line 1736 "SavedSearchDialog.c"
 		SavedSearch* _tmp4_;
 		gchar* _tmp5_;
 		gchar* _tmp6_;
@@ -1674,11 +1752,11 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 		_tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0;
 #line 778 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_free0 (_tmp6_);
-#line 1678 "SavedSearchDialog.c"
+#line 1756 "SavedSearchDialog.c"
 	} else {
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = FALSE;
-#line 1682 "SavedSearchDialog.c"
+#line 1760 "SavedSearchDialog.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
@@ -1686,7 +1764,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 		result = TRUE;
 #line 779 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1690 "SavedSearchDialog.c"
+#line 1768 "SavedSearchDialog.c"
 	}
 #line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->search_title;
@@ -1706,7 +1784,7 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 		result = FALSE;
 #line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1710 "SavedSearchDialog.c"
+#line 1788 "SavedSearchDialog.c"
 	}
 #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_table_get_instance ();
@@ -1718,170 +1796,160 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 	_tmp17_ = gtk_entry_get_text (_tmp16_);
 #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = saved_search_table_exists (_tmp15_, _tmp17_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = _tmp18_;
 #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_table_unref0 (_tmp15_);
 #line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp19_) {
+	if (_tmp18_) {
 #line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = FALSE;
 #line 783 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1732 "SavedSearchDialog.c"
+#line 1808 "SavedSearchDialog.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
 #line 784 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1738 "SavedSearchDialog.c"
+#line 1814 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v) {
-	gboolean _tmp0_;
-	gboolean _tmp22_;
+static void
+saved_search_dialog_set_valid (SavedSearchDialog* self,
+                               gboolean v)
+{
+	gboolean _tmp18_;
 #line 788 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
 #line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = v;
-#line 789 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (!_tmp0_) {
+	if (!v) {
 #line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self->priv->valid = FALSE;
-#line 1753 "SavedSearchDialog.c"
+#line 1829 "SavedSearchDialog.c"
 	} else {
-		gboolean _tmp1_;
-		gboolean _tmp2_;
+		gboolean _tmp0_;
 #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp1_ = v;
+		_tmp0_ = self->priv->valid;
 #line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp2_ = self->priv->valid;
-#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		if (_tmp1_ != _tmp2_) {
-#line 1763 "SavedSearchDialog.c"
-			gboolean _tmp3_;
-#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp3_ = saved_search_dialog_is_title_valid (self);
+		if (v != _tmp0_) {
 #line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			if (_tmp3_) {
-#line 1769 "SavedSearchDialog.c"
+			if (saved_search_dialog_is_title_valid (self)) {
+#line 1838 "SavedSearchDialog.c"
 				gint valid_rows = 0;
-				gint _tmp18_;
-				GeeArrayList* _tmp19_;
-				gint _tmp20_;
-				gint _tmp21_;
+				gint _tmp14_;
+				GeeArrayList* _tmp15_;
+				gint _tmp16_;
+				gint _tmp17_;
 #line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				valid_rows = 0;
-#line 1777 "SavedSearchDialog.c"
+#line 1846 "SavedSearchDialog.c"
 				{
 					GeeArrayList* _c_list = NULL;
-					GeeArrayList* _tmp4_;
-					GeeArrayList* _tmp5_;
+					GeeArrayList* _tmp1_;
+					GeeArrayList* _tmp2_;
 					gint _c_size = 0;
-					GeeArrayList* _tmp6_;
-					gint _tmp7_;
-					gint _tmp8_;
+					GeeArrayList* _tmp3_;
+					gint _tmp4_;
+					gint _tmp5_;
 					gint _c_index = 0;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_tmp4_ = self->priv->row_list;
+					_tmp1_ = self->priv->row_list;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_tmp5_ = _g_object_ref0 (_tmp4_);
+					_tmp2_ = _g_object_ref0 (_tmp1_);
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_c_list = _tmp5_;
+					_c_list = _tmp2_;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_tmp6_ = _c_list;
+					_tmp3_ = _c_list;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+					_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_tmp8_ = _tmp7_;
+					_tmp5_ = _tmp4_;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-					_c_size = _tmp8_;
+					_c_size = _tmp5_;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_index = -1;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					while (TRUE) {
-#line 1805 "SavedSearchDialog.c"
-						gint _tmp9_;
-						gint _tmp10_;
-						gint _tmp11_;
+#line 1874 "SavedSearchDialog.c"
+						gint _tmp6_;
+						gint _tmp7_;
+						gint _tmp8_;
 						SavedSearchDialogSearchRowContainer* c = NULL;
-						GeeArrayList* _tmp12_;
-						gint _tmp13_;
-						gpointer _tmp14_;
-						SavedSearchDialogSearchRowContainer* _tmp15_;
-						gboolean _tmp16_;
+						GeeArrayList* _tmp9_;
+						gint _tmp10_;
+						gpointer _tmp11_;
+						SavedSearchDialogSearchRowContainer* _tmp12_;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp9_ = _c_index;
+						_tmp6_ = _c_index;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_c_index = _tmp9_ + 1;
+						_c_index = _tmp6_ + 1;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp10_ = _c_index;
+						_tmp7_ = _c_index;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp11_ = _c_size;
+						_tmp8_ = _c_size;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						if (!(_tmp10_ < _tmp11_)) {
+						if (!(_tmp7_ < _tmp8_)) {
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							break;
-#line 1827 "SavedSearchDialog.c"
+#line 1895 "SavedSearchDialog.c"
 						}
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp12_ = _c_list;
+						_tmp9_ = _c_list;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp13_ = _c_index;
+						_tmp10_ = _c_index;
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_);
+						_tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_);
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						c = (SavedSearchDialogSearchRowContainer*) _tmp14_;
+						c = (SavedSearchDialogSearchRowContainer*) _tmp11_;
 #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp15_ = c;
+						_tmp12_ = c;
 #line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						_tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_);
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-						if (_tmp16_) {
-#line 1843 "SavedSearchDialog.c"
-							gint _tmp17_;
+						if (saved_search_dialog_search_row_container_is_complete (_tmp12_)) {
+#line 1909 "SavedSearchDialog.c"
+							gint _tmp13_;
 #line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-							_tmp17_ = valid_rows;
+							_tmp13_ = valid_rows;
 #line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-							valid_rows = _tmp17_ + 1;
-#line 1849 "SavedSearchDialog.c"
+							valid_rows = _tmp13_ + 1;
+#line 1915 "SavedSearchDialog.c"
 						}
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_saved_search_dialog_search_row_container_unref0 (c);
-#line 1853 "SavedSearchDialog.c"
+#line 1919 "SavedSearchDialog.c"
 					}
 #line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_g_object_unref0 (_c_list);
-#line 1857 "SavedSearchDialog.c"
+#line 1923 "SavedSearchDialog.c"
 				}
 #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp18_ = valid_rows;
+				_tmp14_ = valid_rows;
 #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp19_ = self->priv->row_list;
+				_tmp15_ = self->priv->row_list;
 #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+				_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				_tmp21_ = _tmp20_;
+				_tmp17_ = _tmp16_;
 #line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-				self->priv->valid = _tmp18_ == _tmp21_;
-#line 1869 "SavedSearchDialog.c"
+				self->priv->valid = _tmp14_ == _tmp17_;
+#line 1935 "SavedSearchDialog.c"
 			} else {
 #line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = FALSE;
-#line 1873 "SavedSearchDialog.c"
+#line 1939 "SavedSearchDialog.c"
 			}
 		}
 	}
 #line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->valid;
+	_tmp18_ = self->priv->valid;
 #line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp22_);
-#line 1881 "SavedSearchDialog.c"
+	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp18_);
+#line 1947 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type) {
+static SavedSearchDialogSearchRowContainer*
+saved_search_dialog_search_row_container_construct (GType object_type)
+{
 	SavedSearchDialogSearchRowContainer* self = NULL;
 #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
@@ -1891,27 +1959,29 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta
 	saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
 #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 1895 "SavedSearchDialog.c"
+#line 1963 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) {
+static SavedSearchDialogSearchRowContainer*
+saved_search_dialog_search_row_container_new (void)
+{
 #line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 1902 "SavedSearchDialog.c"
+#line 1972 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct_edit_existing (GType object_type, SearchCondition* sc) {
+static SavedSearchDialogSearchRowContainer*
+saved_search_dialog_search_row_container_construct_edit_existing (GType object_type,
+                                                                  SearchCondition* sc)
+{
 	SavedSearchDialogSearchRowContainer* self = NULL;
-	SearchCondition* _tmp0_;
+	SearchConditionSearchType _tmp0_;
 	SearchConditionSearchType _tmp1_;
 	SearchConditionSearchType _tmp2_;
-	SearchCondition* _tmp3_;
-	SearchConditionSearchType _tmp4_;
-	SearchConditionSearchType _tmp5_;
-	SavedSearchDialogSearchRow* _tmp6_;
-	SearchCondition* _tmp7_;
+	SearchConditionSearchType _tmp3_;
+	SavedSearchDialogSearchRow* _tmp4_;
 #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL);
 #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -1919,55 +1989,59 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta
 #line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_setup_gui (self);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = sc;
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = search_condition_get_search_type (_tmp0_);
+	_tmp0_ = search_condition_get_search_type (sc);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type (self, _tmp2_);
+	saved_search_dialog_search_row_container_set_type (self, _tmp1_);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = sc;
+	_tmp2_ = search_condition_get_search_type (sc);
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = search_condition_get_search_type (_tmp3_);
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_);
-#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->my_row;
+	saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = sc;
+	_tmp4_ = self->priv->my_row;
 #line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_populate (_tmp6_, _tmp7_);
+	saved_search_dialog_search_row_populate (_tmp4_, sc);
 #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 1946 "SavedSearchDialog.c"
+#line 2010 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) {
+static SavedSearchDialogSearchRowContainer*
+saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc)
+{
 #line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc);
-#line 1953 "SavedSearchDialog.c"
+#line 2019 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                                 gpointer self)
+{
 #line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self);
-#line 1960 "SavedSearchDialog.c"
+#line 2029 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_container_on_removed_gtk_button_clicked (GtkButton* _sender,
+                                                                         gpointer self)
+{
 #line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self);
-#line 1967 "SavedSearchDialog.c"
+#line 2039 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self) {
+static void
+saved_search_dialog_search_row_container_setup_gui (SavedSearchDialogSearchRowContainer* self)
+{
 	gint _tmp0_;
 	SearchConditionSearchType* _tmp1_;
 	GeeHashMap* _tmp2_;
@@ -2014,19 +2088,19 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 	_g_object_unref0 (self->priv->type_combo);
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->type_combo = _tmp3_;
-#line 2018 "SavedSearchDialog.c"
+#line 2092 "SavedSearchDialog.c"
 	{
 		gint i = 0;
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		i = 0;
-#line 2023 "SavedSearchDialog.c"
+#line 2097 "SavedSearchDialog.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp4_ = TRUE;
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 2030 "SavedSearchDialog.c"
+#line 2104 "SavedSearchDialog.c"
 				gint _tmp6_;
 				SearchConditionSearchType* _tmp7_;
 				gint _tmp7__length1;
@@ -2044,13 +2118,13 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				gchar* _tmp17_;
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!_tmp4_) {
-#line 2048 "SavedSearchDialog.c"
+#line 2122 "SavedSearchDialog.c"
 					gint _tmp5_;
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = i;
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					i = _tmp5_ + 1;
-#line 2054 "SavedSearchDialog.c"
+#line 2128 "SavedSearchDialog.c"
 				}
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp4_ = FALSE;
@@ -2064,7 +2138,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				if (!(_tmp6_ < _tmp7__length1)) {
 #line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 2068 "SavedSearchDialog.c"
+#line 2142 "SavedSearchDialog.c"
 				}
 #line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = self->priv->search_types;
@@ -2096,7 +2170,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				gtk_combo_box_text_append_text (_tmp14_, _tmp17_);
 #line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp17_);
-#line 2100 "SavedSearchDialog.c"
+#line 2174 "SavedSearchDialog.c"
 			}
 		}
 	}
@@ -2107,7 +2181,7 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 #line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed, self);
 #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
+	_tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("window-close-symbolic", (GtkIconSize) GTK_ICON_SIZE_BUTTON);
 #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
 #line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2162,29 +2236,30 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 	_tmp31_ = self->priv->box;
 #line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 2166 "SavedSearchDialog.c"
+#line 2240 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) {
-	SearchConditionSearchType _tmp0_;
+static void
+saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self)
+{
 #line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = saved_search_dialog_search_row_container_get_search_type (self);
-#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_container_set_type (self, _tmp0_);
+	saved_search_dialog_search_row_container_set_type (self, saved_search_dialog_search_row_container_get_search_type (self));
 #line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, self);
-#line 2180 "SavedSearchDialog.c"
+#line 2253 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType st) {
+static void
+saved_search_dialog_search_row_container_set_type_combo_box (SavedSearchDialogSearchRowContainer* self,
+                                                             SearchConditionSearchType st)
+{
 	GtkComboBoxText* _tmp0_;
 	GeeHashMap* _tmp1_;
-	SearchConditionSearchType _tmp2_;
-	gpointer _tmp3_;
+	gpointer _tmp2_;
 #line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2192,29 +2267,29 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->search_types_index;
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = st;
+	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) st));
 #line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_));
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_));
-#line 2201 "SavedSearchDialog.c"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp2_));
+#line 2274 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type) {
+static void
+saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self,
+                                                   SearchConditionSearchType type)
+{
 	SavedSearchDialogSearchRow* _tmp0_;
-	SearchConditionSearchType _tmp5_;
-	GtkBox* _tmp12_;
-	SavedSearchDialogSearchRow* _tmp13_;
+	GtkBox* _tmp11_;
+	SavedSearchDialogSearchRow* _tmp12_;
+	GtkWidget* _tmp13_;
 	GtkWidget* _tmp14_;
-	GtkWidget* _tmp15_;
 #line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
 #line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ != NULL) {
-#line 2218 "SavedSearchDialog.c"
+#line 2293 "SavedSearchDialog.c"
 		GtkBox* _tmp1_;
 		SavedSearchDialogSearchRow* _tmp2_;
 		GtkWidget* _tmp3_;
@@ -2231,12 +2306,10 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_);
 #line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2235 "SavedSearchDialog.c"
+#line 2310 "SavedSearchDialog.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = type;
-#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	switch (_tmp5_) {
+	switch (type) {
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2249,124 +2322,125 @@ static void saved_search_dialog_search_row_container_set_type (SavedSearchDialog
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 2253 "SavedSearchDialog.c"
+#line 2326 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowText* _tmp6_;
+			SavedSearchDialogSearchRowText* _tmp5_;
 #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp6_ = saved_search_dialog_search_row_text_new (self);
+			_tmp5_ = saved_search_dialog_search_row_text_new (self);
 #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
 #line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
+			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 86 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2264 "SavedSearchDialog.c"
+#line 2337 "SavedSearchDialog.c"
 		}
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 2268 "SavedSearchDialog.c"
+#line 2341 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowMediaType* _tmp7_;
+			SavedSearchDialogSearchRowMediaType* _tmp6_;
 #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp7_ = saved_search_dialog_search_row_media_type_new (self);
+			_tmp6_ = saved_search_dialog_search_row_media_type_new (self);
 #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
 #line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
+			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 90 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2279 "SavedSearchDialog.c"
+#line 2352 "SavedSearchDialog.c"
 		}
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 2283 "SavedSearchDialog.c"
+#line 2356 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowFlagged* _tmp8_;
+			SavedSearchDialogSearchRowFlagged* _tmp7_;
 #line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp8_ = saved_search_dialog_search_row_flagged_new (self);
+			_tmp7_ = saved_search_dialog_search_row_flagged_new (self);
 #line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
 #line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
+			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 94 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2294 "SavedSearchDialog.c"
+#line 2367 "SavedSearchDialog.c"
 		}
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 2298 "SavedSearchDialog.c"
+#line 2371 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowModified* _tmp9_;
+			SavedSearchDialogSearchRowModified* _tmp8_;
 #line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp9_ = saved_search_dialog_search_row_modified_new (self);
+			_tmp8_ = saved_search_dialog_search_row_modified_new (self);
 #line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
 #line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
+			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 98 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2309 "SavedSearchDialog.c"
+#line 2382 "SavedSearchDialog.c"
 		}
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 2313 "SavedSearchDialog.c"
+#line 2386 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowRating* _tmp10_;
+			SavedSearchDialogSearchRowRating* _tmp9_;
 #line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp10_ = saved_search_dialog_search_row_rating_new (self);
+			_tmp9_ = saved_search_dialog_search_row_rating_new (self);
 #line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
 #line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
+			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 102 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2324 "SavedSearchDialog.c"
+#line 2397 "SavedSearchDialog.c"
 		}
 #line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 2328 "SavedSearchDialog.c"
+#line 2401 "SavedSearchDialog.c"
 		{
-			SavedSearchDialogSearchRowDate* _tmp11_;
+			SavedSearchDialogSearchRowDate* _tmp10_;
 #line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp11_ = saved_search_dialog_search_row_date_new (self);
+			_tmp10_ = saved_search_dialog_search_row_date_new (self);
 #line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
 #line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
+			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2339 "SavedSearchDialog.c"
+#line 2412 "SavedSearchDialog.c"
 		}
 		default:
 		{
 #line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			g_assert_not_reached ();
-#line 2345 "SavedSearchDialog.c"
+#line 2418 "SavedSearchDialog.c"
 		}
 	}
 #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->box;
+	_tmp11_ = self->priv->box;
 #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->my_row;
+	_tmp12_ = self->priv->my_row;
 #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = saved_search_dialog_search_row_get_widget (_tmp13_);
+	_tmp13_ = saved_search_dialog_search_row_get_widget (_tmp12_);
 #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (_tmp11_, _tmp14_, TRUE, TRUE, (guint) 0);
 #line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp15_);
-#line 2360 "SavedSearchDialog.c"
+	_g_object_unref0 (_tmp14_);
+#line 2433 "SavedSearchDialog.c"
 }
 
 
-static SearchConditionSearchType saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self) {
+static SearchConditionSearchType
+saved_search_dialog_search_row_container_get_search_type (SavedSearchDialogSearchRowContainer* self)
+{
 	SearchConditionSearchType result = 0;
 	SearchConditionSearchType* _tmp0_;
 	gint _tmp0__length1;
 	GtkComboBoxText* _tmp1_;
-	gint _tmp2_;
-	SearchConditionSearchType _tmp3_;
+	SearchConditionSearchType _tmp2_;
 #line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0);
 #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2376,42 +2450,44 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se
 #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->type_combo;
 #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = _tmp0_[_tmp2_];
+	_tmp2_ = _tmp0_[gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))];
 #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2387 "SavedSearchDialog.c"
+#line 2459 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self) {
+static void
+saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self)
+{
 #line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 120 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (self, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL], 0, self);
-#line 2396 "SavedSearchDialog.c"
+#line 2470 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) {
+static void
+saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self,
+                                                        gboolean allow)
+{
 	GtkButton* _tmp0_;
-	gboolean _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
 #line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->remove_button;
 #line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = allow;
-#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2411 "SavedSearchDialog.c"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), allow);
+#line 2485 "SavedSearchDialog.c"
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self) {
+static GtkWidget*
+saved_search_dialog_search_row_container_get_widget (SavedSearchDialogSearchRowContainer* self)
+{
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
 	GtkWidget* _tmp1_;
@@ -2425,11 +2501,13 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear
 	result = _tmp1_;
 #line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2429 "SavedSearchDialog.c"
+#line 2505 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self) {
+static SearchCondition*
+saved_search_dialog_search_row_container_get_search_condition (SavedSearchDialogSearchRowContainer* self)
+{
 	SearchCondition* result = NULL;
 	SavedSearchDialogSearchRow* _tmp0_;
 	SearchCondition* _tmp1_;
@@ -2443,29 +2521,35 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond
 	result = _tmp1_;
 #line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2447 "SavedSearchDialog.c"
+#line 2525 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self) {
+static gboolean
+saved_search_dialog_search_row_container_is_complete (SavedSearchDialogSearchRowContainer* self)
+{
 	gboolean result = FALSE;
 	SavedSearchDialogSearchRow* _tmp0_;
-	gboolean _tmp1_;
 #line 135 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_is_complete (_tmp0_);
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	result = _tmp1_;
+	result = saved_search_dialog_search_row_is_complete (_tmp0_);
 #line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2465 "SavedSearchDialog.c"
+#line 2542 "SavedSearchDialog.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER (GClosure * closure,
+                                                                        GValue * return_value,
+                                                                        guint n_param_values,
+                                                                        const GValue * param_values,
+                                                                        gpointer invocation_hint,
+                                                                        gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (gpointer data1, gpointer arg_1, gpointer data2);
 	register GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER callback;
 	register GCClosure * cc;
@@ -2480,120 +2564,145 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN
 		data1 = closure->data;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2484 "SavedSearchDialog.c"
+#line 2568 "SavedSearchDialog.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = closure->data;
-#line 2490 "SavedSearchDialog.c"
+#line 2574 "SavedSearchDialog.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2);
-#line 2496 "SavedSearchDialog.c"
+#line 2580 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_value_search_row_container_init (GValue* value) {
+static void
+saved_search_dialog_value_search_row_container_init (GValue* value)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 2503 "SavedSearchDialog.c"
+#line 2589 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_value_search_row_container_free_value (GValue* value) {
+static void
+saved_search_dialog_value_search_row_container_free_value (GValue* value)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (value->data[0].v_pointer);
-#line 2512 "SavedSearchDialog.c"
+#line 2600 "SavedSearchDialog.c"
 	}
 }
 
 
-static void saved_search_dialog_value_search_row_container_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+saved_search_dialog_value_search_row_container_copy_value (const GValue* src_value,
+                                                           GValue* dest_value)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (src_value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer);
-#line 2522 "SavedSearchDialog.c"
+#line 2613 "SavedSearchDialog.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2526 "SavedSearchDialog.c"
+#line 2617 "SavedSearchDialog.c"
 	}
 }
 
 
-static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) {
+static gpointer
+saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2534 "SavedSearchDialog.c"
+#line 2627 "SavedSearchDialog.c"
 }
 
 
-static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+saved_search_dialog_value_search_row_container_collect_value (GValue* value,
+                                                              guint n_collect_values,
+                                                              GTypeCValue* collect_values,
+                                                              guint collect_flags)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 2541 "SavedSearchDialog.c"
+#line 2639 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowContainer * object;
 		object = collect_values[0].v_pointer;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2548 "SavedSearchDialog.c"
+#line 2646 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2552 "SavedSearchDialog.c"
+#line 2650 "SavedSearchDialog.c"
 		}
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object);
-#line 2556 "SavedSearchDialog.c"
+#line 2654 "SavedSearchDialog.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2560 "SavedSearchDialog.c"
+#line 2658 "SavedSearchDialog.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2564 "SavedSearchDialog.c"
+#line 2662 "SavedSearchDialog.c"
 }
 
 
-static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+saved_search_dialog_value_search_row_container_lcopy_value (const GValue* value,
+                                                            guint n_collect_values,
+                                                            GTypeCValue* collect_values,
+                                                            guint collect_flags)
+{
 	SavedSearchDialogSearchRowContainer ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2575 "SavedSearchDialog.c"
+#line 2678 "SavedSearchDialog.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 2581 "SavedSearchDialog.c"
+#line 2684 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2585 "SavedSearchDialog.c"
+#line 2688 "SavedSearchDialog.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2589 "SavedSearchDialog.c"
+#line 2692 "SavedSearchDialog.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2593 "SavedSearchDialog.c"
+#line 2696 "SavedSearchDialog.c"
 }
 
 
-static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+saved_search_dialog_param_spec_search_row_container (const gchar* name,
+                                                     const gchar* nick,
+                                                     const gchar* blurb,
+                                                     GType object_type,
+                                                     GParamFlags flags)
+{
 	SavedSearchDialogParamSpecSearchRowContainer* spec;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
@@ -2603,20 +2712,25 @@ static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 2607 "SavedSearchDialog.c"
+#line 2716 "SavedSearchDialog.c"
 }
 
 
-static gpointer saved_search_dialog_value_get_search_row_container (const GValue* value) {
+static gpointer
+saved_search_dialog_value_get_search_row_container (const GValue* value)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2616 "SavedSearchDialog.c"
+#line 2727 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_value_set_search_row_container (GValue* value, gpointer v_object) {
+static void
+saved_search_dialog_value_set_search_row_container (GValue* value,
+                                                    gpointer v_object)
+{
 	SavedSearchDialogSearchRowContainer * old;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
@@ -2632,22 +2746,25 @@ static void saved_search_dialog_value_set_search_row_container (GValue* value, g
 		value->data[0].v_pointer = v_object;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2636 "SavedSearchDialog.c"
+#line 2750 "SavedSearchDialog.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2640 "SavedSearchDialog.c"
+#line 2754 "SavedSearchDialog.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2646 "SavedSearchDialog.c"
+#line 2760 "SavedSearchDialog.c"
 	}
 }
 
 
-static void saved_search_dialog_value_take_search_row_container (GValue* value, gpointer v_object) {
+static void
+saved_search_dialog_value_take_search_row_container (GValue* value,
+                                                     gpointer v_object)
+{
 	SavedSearchDialogSearchRowContainer * old;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER));
@@ -2661,22 +2778,24 @@ static void saved_search_dialog_value_take_search_row_container (GValue* value,
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 2665 "SavedSearchDialog.c"
+#line 2782 "SavedSearchDialog.c"
 	} else {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2669 "SavedSearchDialog.c"
+#line 2786 "SavedSearchDialog.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2675 "SavedSearchDialog.c"
+#line 2792 "SavedSearchDialog.c"
 	}
 }
 
 
-static void saved_search_dialog_search_row_container_class_init (SavedSearchDialogSearchRowContainerClass * klass) {
+static void
+saved_search_dialog_search_row_container_class_init (SavedSearchDialogSearchRowContainerClass * klass)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_parent_class = g_type_class_peek_parent (klass);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2687,22 +2806,26 @@ static void saved_search_dialog_search_row_container_class_init (SavedSearchDial
 	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_REMOVE_SIGNAL] = g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL] = g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2691 "SavedSearchDialog.c"
+#line 2810 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self) {
+static void
+saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self)
+{
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE (self);
 #line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->my_row = NULL;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 2702 "SavedSearchDialog.c"
+#line 2823 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj) {
+static void
+saved_search_dialog_search_row_container_finalize (SavedSearchDialogSearchRowContainer * obj)
+{
 	SavedSearchDialogSearchRowContainer * self;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, SavedSearchDialogSearchRowContainer);
@@ -2720,11 +2843,13 @@ static void saved_search_dialog_search_row_container_finalize (SavedSearchDialog
 	_g_object_unref0 (self->priv->search_types_index);
 #line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 2724 "SavedSearchDialog.c"
+#line 2847 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_container_get_type (void) {
+static GType
+saved_search_dialog_search_row_container_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_container_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_container_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { saved_search_dialog_value_search_row_container_init, saved_search_dialog_value_search_row_container_free_value, saved_search_dialog_value_search_row_container_copy_value, saved_search_dialog_value_search_row_container_peek_pointer, "p", saved_search_dialog_value_search_row_container_collect_value, "p", saved_search_dialog_value_search_row_container_lcopy_value };
@@ -2738,18 +2863,22 @@ static GType saved_search_dialog_search_row_container_get_type (void) {
 }
 
 
-static gpointer saved_search_dialog_search_row_container_ref (gpointer instance) {
+static gpointer
+saved_search_dialog_search_row_container_ref (gpointer instance)
+{
 	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 2749 "SavedSearchDialog.c"
+#line 2876 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_container_unref (gpointer instance) {
+static void
+saved_search_dialog_search_row_container_unref (gpointer instance)
+{
 	SavedSearchDialogSearchRowContainer * self;
 	self = instance;
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -2758,192 +2887,237 @@ static void saved_search_dialog_search_row_container_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self);
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2762 "SavedSearchDialog.c"
+#line 2891 "SavedSearchDialog.c"
 	}
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self) {
+static GtkWidget*
+saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self)
+{
 #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2772 "SavedSearchDialog.c"
+#line 2903 "SavedSearchDialog.c"
 }
 
 
-GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self) {
+GtkWidget*
+saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self)
+{
 #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
 #line 143 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self);
-#line 2781 "SavedSearchDialog.c"
+#line 2914 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self) {
+static SearchCondition*
+saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self)
+{
 #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2790 "SavedSearchDialog.c"
+#line 2925 "SavedSearchDialog.c"
 }
 
 
-SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self) {
+SearchCondition*
+saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self)
+{
 #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
 #line 146 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self);
-#line 2799 "SavedSearchDialog.c"
+#line 2936 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
+static void
+saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self,
+                                              SearchCondition* sc)
+{
 #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return;
-#line 2808 "SavedSearchDialog.c"
+#line 2948 "SavedSearchDialog.c"
 }
 
 
-void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
+void
+saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self,
+                                         SearchCondition* sc)
+{
 #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self));
 #line 149 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc);
-#line 2817 "SavedSearchDialog.c"
+#line 2960 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) {
+static gboolean
+saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self)
+{
 	gboolean _tmp0_ = FALSE;
 #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _tmp0_;
-#line 2827 "SavedSearchDialog.c"
+#line 2972 "SavedSearchDialog.c"
 }
 
 
-gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self) {
+gboolean
+saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self)
+{
 #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE);
 #line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self);
-#line 2836 "SavedSearchDialog.c"
+#line 2983 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type) {
+static SavedSearchDialogSearchRow*
+saved_search_dialog_search_row_construct (GType object_type)
+{
 	SavedSearchDialogSearchRow* self = NULL;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type);
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2846 "SavedSearchDialog.c"
+#line 2995 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_value_search_row_init (GValue* value) {
+static void
+saved_search_dialog_value_search_row_init (GValue* value)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 2853 "SavedSearchDialog.c"
+#line 3004 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_value_search_row_free_value (GValue* value) {
+static void
+saved_search_dialog_value_search_row_free_value (GValue* value)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (value->data[0].v_pointer) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (value->data[0].v_pointer);
-#line 2862 "SavedSearchDialog.c"
+#line 3015 "SavedSearchDialog.c"
 	}
 }
 
 
-static void saved_search_dialog_value_search_row_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+saved_search_dialog_value_search_row_copy_value (const GValue* src_value,
+                                                 GValue* dest_value)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (src_value->data[0].v_pointer) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer);
-#line 2872 "SavedSearchDialog.c"
+#line 3028 "SavedSearchDialog.c"
 	} else {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2876 "SavedSearchDialog.c"
+#line 3032 "SavedSearchDialog.c"
 	}
 }
 
 
-static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) {
+static gpointer
+saved_search_dialog_value_search_row_peek_pointer (const GValue* value)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2884 "SavedSearchDialog.c"
+#line 3042 "SavedSearchDialog.c"
 }
 
 
-static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+saved_search_dialog_value_search_row_collect_value (GValue* value,
+                                                    guint n_collect_values,
+                                                    GTypeCValue* collect_values,
+                                                    guint collect_flags)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 2891 "SavedSearchDialog.c"
+#line 3054 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRow * object;
 		object = collect_values[0].v_pointer;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2898 "SavedSearchDialog.c"
+#line 3061 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2902 "SavedSearchDialog.c"
+#line 3065 "SavedSearchDialog.c"
 		}
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_ref (object);
-#line 2906 "SavedSearchDialog.c"
+#line 3069 "SavedSearchDialog.c"
 	} else {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2910 "SavedSearchDialog.c"
+#line 3073 "SavedSearchDialog.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2914 "SavedSearchDialog.c"
+#line 3077 "SavedSearchDialog.c"
 }
 
 
-static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+saved_search_dialog_value_search_row_lcopy_value (const GValue* value,
+                                                  guint n_collect_values,
+                                                  GTypeCValue* collect_values,
+                                                  guint collect_flags)
+{
 	SavedSearchDialogSearchRow ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2925 "SavedSearchDialog.c"
+#line 3093 "SavedSearchDialog.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 2931 "SavedSearchDialog.c"
+#line 3099 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2935 "SavedSearchDialog.c"
+#line 3103 "SavedSearchDialog.c"
 	} else {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 2939 "SavedSearchDialog.c"
+#line 3107 "SavedSearchDialog.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2943 "SavedSearchDialog.c"
+#line 3111 "SavedSearchDialog.c"
 }
 
 
-static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+saved_search_dialog_param_spec_search_row (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags)
+{
 	SavedSearchDialogParamSpecSearchRow* spec;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
@@ -2953,20 +3127,25 @@ static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 2957 "SavedSearchDialog.c"
+#line 3131 "SavedSearchDialog.c"
 }
 
 
-static gpointer saved_search_dialog_value_get_search_row (const GValue* value) {
+static gpointer
+saved_search_dialog_value_get_search_row (const GValue* value)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2966 "SavedSearchDialog.c"
+#line 3142 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) {
+static void
+saved_search_dialog_value_set_search_row (GValue* value,
+                                          gpointer v_object)
+{
 	SavedSearchDialogSearchRow * old;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
@@ -2982,22 +3161,25 @@ static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_
 		value->data[0].v_pointer = v_object;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 2986 "SavedSearchDialog.c"
+#line 3165 "SavedSearchDialog.c"
 	} else {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2990 "SavedSearchDialog.c"
+#line 3169 "SavedSearchDialog.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 2996 "SavedSearchDialog.c"
+#line 3175 "SavedSearchDialog.c"
 	}
 }
 
 
-static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) {
+static void
+saved_search_dialog_value_take_search_row (GValue* value,
+                                           gpointer v_object)
+{
 	SavedSearchDialogSearchRow * old;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
@@ -3011,22 +3193,24 @@ static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 3015 "SavedSearchDialog.c"
+#line 3197 "SavedSearchDialog.c"
 	} else {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3019 "SavedSearchDialog.c"
+#line 3201 "SavedSearchDialog.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3025 "SavedSearchDialog.c"
+#line 3207 "SavedSearchDialog.c"
 	}
 }
 
 
-static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass) {
+static void
+saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_parent_class = g_type_class_peek_parent (klass);
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3039,28 +3223,34 @@ static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRo
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_real_populate;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_real_is_complete;
-#line 3043 "SavedSearchDialog.c"
+#line 3227 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) {
+static void
+saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self)
+{
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 3050 "SavedSearchDialog.c"
+#line 3236 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj) {
+static void
+saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow * obj)
+{
 	SavedSearchDialogSearchRow * self;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 3060 "SavedSearchDialog.c"
+#line 3248 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_get_type (void) {
+static GType
+saved_search_dialog_search_row_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { saved_search_dialog_value_search_row_init, saved_search_dialog_value_search_row_free_value, saved_search_dialog_value_search_row_copy_value, saved_search_dialog_value_search_row_peek_pointer, "p", saved_search_dialog_value_search_row_collect_value, "p", saved_search_dialog_value_search_row_lcopy_value };
@@ -3074,18 +3264,22 @@ static GType saved_search_dialog_search_row_get_type (void) {
 }
 
 
-static gpointer saved_search_dialog_search_row_ref (gpointer instance) {
+static gpointer
+saved_search_dialog_search_row_ref (gpointer instance)
+{
 	SavedSearchDialogSearchRow * self;
 	self = instance;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 3085 "SavedSearchDialog.c"
+#line 3277 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_unref (gpointer instance) {
+static void
+saved_search_dialog_search_row_unref (gpointer instance)
+{
 	SavedSearchDialogSearchRow * self;
 	self = instance;
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3094,36 +3288,47 @@ static void saved_search_dialog_search_row_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self);
 #line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3098 "SavedSearchDialog.c"
+#line 3292 "SavedSearchDialog.c"
 	}
 }
 
 
-static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                       gpointer self)
+{
 #line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3106 "SavedSearchDialog.c"
+#line 3303 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender,
+                                                                      gpointer self)
+{
 #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3113 "SavedSearchDialog.c"
+#line 3313 "SavedSearchDialog.c"
 }
 
 
-static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) {
+static gpointer
+_saved_search_dialog_search_row_container_ref0 (gpointer self)
+{
 #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? saved_search_dialog_search_row_container_ref (self) : NULL;
-#line 3120 "SavedSearchDialog.c"
+#line 3322 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowText*
+saved_search_dialog_search_row_text_construct (GType object_type,
+                                               SavedSearchDialogSearchRowContainer* parent)
+{
 	SavedSearchDialogSearchRowText* self = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	GtkComboBoxText* _tmp3_;
 	GtkComboBoxText* _tmp4_;
@@ -3133,131 +3338,132 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const
 	GtkComboBoxText* _tmp8_;
 	GtkComboBoxText* _tmp9_;
 	GtkComboBoxText* _tmp10_;
-	GtkComboBoxText* _tmp11_;
+	GtkEntry* _tmp11_;
 	GtkEntry* _tmp12_;
 	GtkEntry* _tmp13_;
 	GtkEntry* _tmp14_;
-	GtkEntry* _tmp15_;
+	GtkBox* _tmp15_;
 	GtkBox* _tmp16_;
-	GtkBox* _tmp17_;
-	GtkComboBoxText* _tmp18_;
-	GtkBox* _tmp19_;
-	GtkEntry* _tmp20_;
-	GtkBox* _tmp21_;
+	GtkComboBoxText* _tmp17_;
+	GtkBox* _tmp18_;
+	GtkEntry* _tmp19_;
+	GtkBox* _tmp20_;
 #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowText*) saved_search_dialog_search_row_construct (object_type);
 #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = parent;
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
+	_tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent);
 #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->parent = _tmp1_;
+	self->priv->parent = _tmp0_;
 #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->text_context);
 #line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->text_context = _tmp2_;
+	self->priv->text_context = _tmp1_;
 #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->text_context;
+	_tmp2_ = self->priv->text_context;
 #line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _ ("contains"));
+	gtk_combo_box_text_append_text (_tmp2_, _ ("contains"));
 #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->text_context;
+	_tmp3_ = self->priv->text_context;
 #line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp4_, _ ("is exactly"));
+	gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly"));
 #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->text_context;
+	_tmp4_ = self->priv->text_context;
 #line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _ ("starts with"));
+	gtk_combo_box_text_append_text (_tmp4_, _ ("starts with"));
 #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->text_context;
+	_tmp5_ = self->priv->text_context;
 #line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp6_, _ ("ends with"));
+	gtk_combo_box_text_append_text (_tmp5_, _ ("ends with"));
 #line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->text_context;
+	_tmp6_ = self->priv->text_context;
 #line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp7_, _ ("does not contain"));
+	gtk_combo_box_text_append_text (_tmp6_, _ ("does not contain"));
 #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->text_context;
+	_tmp7_ = self->priv->text_context;
 #line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp8_, _ ("is not set"));
+	gtk_combo_box_text_append_text (_tmp7_, _ ("is not set"));
 #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->text_context;
+	_tmp8_ = self->priv->text_context;
 #line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp9_, _ ("is set"));
+	gtk_combo_box_text_append_text (_tmp8_, _ ("is set"));
 #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->text_context;
+	_tmp9_ = self->priv->text_context;
 #line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->text_context;
+	_tmp10_ = self->priv->text_context;
 #line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = (GtkEntry*) gtk_entry_new ();
+	_tmp11_ = (GtkEntry*) gtk_entry_new ();
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp12_);
+	g_object_ref_sink (_tmp11_);
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
 #line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->entry = _tmp12_;
+	self->priv->entry = _tmp11_;
 #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->entry;
+	_tmp12_ = self->priv->entry;
 #line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_width_chars (_tmp13_, 25);
+	gtk_entry_set_width_chars (_tmp12_, 25);
 #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->entry;
+	_tmp13_ = self->priv->entry;
 #line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_activates_default (_tmp14_, TRUE);
+	gtk_entry_set_activates_default (_tmp13_, TRUE);
 #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->entry;
+	_tmp14_ = self->priv->entry;
 #line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_editable_get_type (), GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
 #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp15_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp16_);
+	g_object_ref_sink (_tmp15_);
 #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 182 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp16_;
+	self->priv->box = _tmp15_;
 #line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = self->priv->box;
+	_tmp16_ = self->priv->box;
 #line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->text_context;
+	_tmp17_ = self->priv->text_context;
 #line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = self->priv->box;
+	_tmp18_ = self->priv->box;
 #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->entry;
+	_tmp19_ = self->priv->entry;
 #line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = self->priv->box;
+	_tmp20_ = self->priv->box;
 #line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
 #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3250 "SavedSearchDialog.c"
+#line 3452 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowText*
+saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent)
+{
 #line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent);
-#line 3257 "SavedSearchDialog.c"
+#line 3461 "SavedSearchDialog.c"
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base) {
+static GtkWidget*
+saved_search_dialog_search_row_text_real_get_widget (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowText * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -3272,113 +3478,113 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear
 	result = _tmp1_;
 #line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3276 "SavedSearchDialog.c"
+#line 3482 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_text_real_get_search_condition (SavedSearchDialogSearchRow* base) {
+static SearchCondition*
+saved_search_dialog_search_row_text_real_get_search_condition (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowText * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType type = 0;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SearchConditionSearchType _tmp1_;
 	gchar* text = NULL;
-	GtkEntry* _tmp2_;
-	const gchar* _tmp3_;
-	gchar* _tmp4_;
+	GtkEntry* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 	SearchConditionTextContext context = 0;
-	SearchConditionTextContext _tmp5_;
 	SearchConditionText* c = NULL;
-	SearchConditionText* _tmp6_;
+	SearchConditionText* _tmp4_;
 #line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
 #line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
 #line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	type = _tmp1_;
+	type = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
 #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->entry;
+	_tmp1_ = self->priv->entry;
 #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_entry_get_text (_tmp2_);
+	_tmp2_ = gtk_entry_get_text (_tmp1_);
 #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = g_strdup (_tmp3_);
+	_tmp3_ = g_strdup (_tmp2_);
 #line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	text = _tmp4_;
+	text = _tmp3_;
 #line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	context = _tmp5_;
+	context = saved_search_dialog_search_row_text_get_text_context (self);
 #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_text_new (type, text, context);
+	_tmp4_ = search_condition_text_new (type, text, context);
 #line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	c = _tmp6_;
+	c = _tmp4_;
 #line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (text);
 #line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3324 "SavedSearchDialog.c"
+#line 3526 "SavedSearchDialog.c"
 }
 
 
-static gpointer _search_condition_ref0 (gpointer self) {
+static gpointer
+_search_condition_ref0 (gpointer self)
+{
 #line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? search_condition_ref (self) : NULL;
-#line 3331 "SavedSearchDialog.c"
+#line 3535 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
+static void
+saved_search_dialog_search_row_text_real_populate (SavedSearchDialogSearchRow* base,
+                                                   SearchCondition* sc)
+{
 	SavedSearchDialogSearchRowText * self;
 	SearchConditionText* text = NULL;
-	SearchCondition* _tmp0_;
-	SearchConditionText* _tmp1_;
-	GtkComboBoxText* _tmp2_;
+	SearchConditionText* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	SearchConditionTextContext _tmp2_;
 	SearchConditionTextContext _tmp3_;
-	SearchConditionTextContext _tmp4_;
-	GtkEntry* _tmp5_;
+	GtkEntry* _tmp4_;
+	const gchar* _tmp5_;
 	const gchar* _tmp6_;
-	const gchar* _tmp7_;
 #line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
 #line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
 #line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = sc;
+	_tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) sc) : NULL);
 #line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp0_) : NULL);
-#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	text = _tmp1_;
+	text = _tmp0_;
 #line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (text != NULL, "text != null");
 #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->text_context;
+	_tmp1_ = self->priv->text_context;
 #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = search_condition_text_get_context (text);
+	_tmp2_ = search_condition_text_get_context (text);
 #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_);
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->entry;
+	_tmp4_ = self->priv->entry;
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_text_get_text (text);
+	_tmp5_ = search_condition_text_get_text (text);
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_text (_tmp5_, _tmp7_);
+	gtk_entry_set_text (_tmp4_, _tmp6_);
 #line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed (self);
 #line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (text);
-#line 3378 "SavedSearchDialog.c"
+#line 3582 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base) {
+static gboolean
+saved_search_dialog_search_row_text_real_is_complete (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowText * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
@@ -3409,104 +3615,95 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc
 	if (_tmp7_) {
 #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = TRUE;
-#line 3413 "SavedSearchDialog.c"
+#line 3619 "SavedSearchDialog.c"
 	} else {
-		SearchConditionTextContext _tmp8_;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp8_ = saved_search_dialog_search_row_text_get_text_context (self);
 #line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
-#line 3420 "SavedSearchDialog.c"
+		_tmp1_ = saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
+#line 3623 "SavedSearchDialog.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
 #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3426 "SavedSearchDialog.c"
+#line 3629 "SavedSearchDialog.c"
 	} else {
-		SearchConditionTextContext _tmp9_;
 #line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp9_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3433 "SavedSearchDialog.c"
+		_tmp0_ = saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
+#line 3633 "SavedSearchDialog.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp0_;
 #line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3439 "SavedSearchDialog.c"
+#line 3639 "SavedSearchDialog.c"
 }
 
 
-static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self) {
+static SearchConditionTextContext
+saved_search_dialog_search_row_text_get_text_context (SavedSearchDialogSearchRowText* self)
+{
 	SearchConditionTextContext result = 0;
 	GtkComboBoxText* _tmp0_;
-	gint _tmp1_;
 #line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0);
 #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->text_context;
 #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	result = (SearchConditionTextContext) _tmp1_;
+	result = (SearchConditionTextContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
 #line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3457 "SavedSearchDialog.c"
+#line 3656 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self) {
+static void
+saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSearchRowText* self)
+{
 	gboolean _tmp0_ = FALSE;
-	SearchConditionTextContext _tmp1_;
-	SavedSearchDialogSearchRowContainer* _tmp5_;
-	SavedSearchDialogSearchRowContainer* _tmp6_;
+	SavedSearchDialogSearchRowContainer* _tmp3_;
+	SavedSearchDialogSearchRowContainer* _tmp4_;
 #line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self));
 #line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) {
+	if (saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) {
 #line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3474 "SavedSearchDialog.c"
+#line 3672 "SavedSearchDialog.c"
 	} else {
-		SearchConditionTextContext _tmp2_;
 #line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp2_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3481 "SavedSearchDialog.c"
+		_tmp0_ = saved_search_dialog_search_row_text_get_text_context (self) == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
+#line 3676 "SavedSearchDialog.c"
 	}
 #line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 3485 "SavedSearchDialog.c"
-		GtkEntry* _tmp3_;
+#line 3680 "SavedSearchDialog.c"
+		GtkEntry* _tmp1_;
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp3_ = self->priv->entry;
+		_tmp1_ = self->priv->entry;
 #line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 3491 "SavedSearchDialog.c"
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 3686 "SavedSearchDialog.c"
 	} else {
-		GtkEntry* _tmp4_;
+		GtkEntry* _tmp2_;
 #line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp4_ = self->priv->entry;
+		_tmp2_ = self->priv->entry;
 #line 228 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 3498 "SavedSearchDialog.c"
+		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+#line 3693 "SavedSearchDialog.c"
 	}
 #line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->parent;
+	_tmp3_ = self->priv->parent;
 #line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->parent;
+	_tmp4_ = self->priv->parent;
 #line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_emit (_tmp5_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp6_);
-#line 3506 "SavedSearchDialog.c"
+	g_signal_emit (_tmp3_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp4_);
+#line 3701 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass) {
+static void
+saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass)
+{
 #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_parent_class = g_type_class_peek_parent (klass);
 #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3521,18 +3718,22 @@ static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSea
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_text_real_populate;
 #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_text_real_is_complete;
-#line 3525 "SavedSearchDialog.c"
+#line 3722 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) {
+static void
+saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self)
+{
 #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self);
-#line 3532 "SavedSearchDialog.c"
+#line 3731 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj) {
+static void
+saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearchRow * obj)
+{
 	SavedSearchDialogSearchRowText * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
@@ -3549,9 +3750,9 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc
 #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
 #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("changed", gtk_editable_get_type (), &_tmp3_, NULL, FALSE);
 #line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_editable_get_type (), GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
 #line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3562,11 +3763,13 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj);
-#line 3566 "SavedSearchDialog.c"
+#line 3767 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_text_get_type (void) {
+static GType
+saved_search_dialog_search_row_text_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_text_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_text_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowTextClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_text_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowText), 0, (GInstanceInitFunc) saved_search_dialog_search_row_text_instance_init, NULL };
@@ -3578,17 +3781,23 @@ static GType saved_search_dialog_search_row_text_get_type (void) {
 }
 
 
-static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                             gpointer self)
+{
 #line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self);
-#line 3585 "SavedSearchDialog.c"
+#line 3791 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowMediaType*
+saved_search_dialog_search_row_media_type_construct (GType object_type,
+                                                     SavedSearchDialogSearchRowContainer* parent)
+{
 	SavedSearchDialogSearchRowMediaType* self = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	GtkComboBoxText* _tmp3_;
 	GtkComboBoxText* _tmp4_;
@@ -3599,115 +3808,116 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media
 	GtkComboBoxText* _tmp9_;
 	GtkComboBoxText* _tmp10_;
 	GtkComboBoxText* _tmp11_;
-	GtkComboBoxText* _tmp12_;
+	GtkBox* _tmp12_;
 	GtkBox* _tmp13_;
-	GtkBox* _tmp14_;
-	GtkComboBoxText* _tmp15_;
-	GtkBox* _tmp16_;
-	GtkComboBoxText* _tmp17_;
-	GtkBox* _tmp18_;
+	GtkComboBoxText* _tmp14_;
+	GtkBox* _tmp15_;
+	GtkComboBoxText* _tmp16_;
+	GtkBox* _tmp17_;
 #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowMediaType*) saved_search_dialog_search_row_construct (object_type);
 #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = parent;
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
+	_tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent);
 #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->parent = _tmp1_;
+	self->priv->parent = _tmp0_;
 #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_context);
 #line 246 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->media_context = _tmp2_;
+	self->priv->media_context = _tmp1_;
 #line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->media_context;
+	_tmp2_ = self->priv->media_context;
 #line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _ ("is"));
+	gtk_combo_box_text_append_text (_tmp2_, _ ("is"));
 #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->media_context;
+	_tmp3_ = self->priv->media_context;
 #line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp4_, _ ("is not"));
+	gtk_combo_box_text_append_text (_tmp3_, _ ("is not"));
 #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->media_context;
+	_tmp4_ = self->priv->media_context;
 #line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->media_context;
+	_tmp5_ = self->priv->media_context;
 #line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
 #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp6_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp6_);
 #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
 #line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->media_type = _tmp7_;
+	self->priv->media_type = _tmp6_;
 #line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->media_type;
+	_tmp7_ = self->priv->media_type;
 #line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp8_, _ ("any photo"));
+	gtk_combo_box_text_append_text (_tmp7_, _ ("any photo"));
 #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->media_type;
+	_tmp8_ = self->priv->media_type;
 #line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp9_, _ ("a raw photo"));
+	gtk_combo_box_text_append_text (_tmp8_, _ ("a raw photo"));
 #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->media_type;
+	_tmp9_ = self->priv->media_type;
 #line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp10_, _ ("a video"));
+	gtk_combo_box_text_append_text (_tmp9_, _ ("a video"));
 #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->media_type;
+	_tmp10_ = self->priv->media_type;
 #line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->media_type;
+	_tmp11_ = self->priv->media_type;
 #line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
 #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp12_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp13_);
+	g_object_ref_sink (_tmp12_);
 #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 260 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp13_;
+	self->priv->box = _tmp12_;
 #line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->box;
+	_tmp13_ = self->priv->box;
 #line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->media_context;
+	_tmp14_ = self->priv->media_context;
 #line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->box;
+	_tmp15_ = self->priv->box;
 #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = self->priv->media_type;
+	_tmp16_ = self->priv->media_type;
 #line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->box;
+	_tmp17_ = self->priv->box;
 #line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
 #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3700 "SavedSearchDialog.c"
+#line 3906 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowMediaType*
+saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent)
+{
 #line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent);
-#line 3707 "SavedSearchDialog.c"
+#line 3915 "SavedSearchDialog.c"
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base) {
+static GtkWidget*
+saved_search_dialog_search_row_media_type_real_get_widget (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowMediaType * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -3722,102 +3932,97 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav
 	result = _tmp1_;
 #line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3726 "SavedSearchDialog.c"
+#line 3936 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_media_type_real_get_search_condition (SavedSearchDialogSearchRow* base) {
+static SearchCondition*
+saved_search_dialog_search_row_media_type_real_get_search_condition (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowMediaType * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SearchConditionSearchType _tmp1_;
 	SearchConditionMediaTypeContext context = 0;
-	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
+	GtkComboBoxText* _tmp1_;
 	SearchConditionMediaTypeMediaType type = 0;
-	GtkComboBoxText* _tmp4_;
-	gint _tmp5_;
+	GtkComboBoxText* _tmp2_;
 	SearchConditionMediaType* c = NULL;
-	SearchConditionMediaType* _tmp6_;
+	SearchConditionMediaType* _tmp3_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
 #line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
 #line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_type = _tmp1_;
-#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->media_context;
+	search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
 #line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp1_ = self->priv->media_context;
 #line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	context = (SearchConditionMediaTypeContext) _tmp3_;
+	context = (SearchConditionMediaTypeContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->media_type;
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp2_ = self->priv->media_type;
 #line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	type = (SearchConditionMediaTypeMediaType) _tmp5_;
+	type = (SearchConditionMediaTypeMediaType) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
 #line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_media_type_new (search_type, context, type);
+	_tmp3_ = search_condition_media_type_new (search_type, context, type);
 #line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	c = _tmp6_;
+	c = _tmp3_;
 #line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3772 "SavedSearchDialog.c"
+#line 3975 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
+static void
+saved_search_dialog_search_row_media_type_real_populate (SavedSearchDialogSearchRow* base,
+                                                         SearchCondition* sc)
+{
 	SavedSearchDialogSearchRowMediaType * self;
 	SearchConditionMediaType* media = NULL;
-	SearchCondition* _tmp0_;
-	SearchConditionMediaType* _tmp1_;
-	GtkComboBoxText* _tmp2_;
+	SearchConditionMediaType* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	SearchConditionMediaTypeContext _tmp2_;
 	SearchConditionMediaTypeContext _tmp3_;
-	SearchConditionMediaTypeContext _tmp4_;
-	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp4_;
+	SearchConditionMediaTypeMediaType _tmp5_;
 	SearchConditionMediaTypeMediaType _tmp6_;
-	SearchConditionMediaTypeMediaType _tmp7_;
 #line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
 #line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
 #line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = sc;
-#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp0_) : NULL);
+	_tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) sc) : NULL);
 #line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	media = _tmp1_;
+	media = _tmp0_;
 #line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (media != NULL, "media != null");
 #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->media_context;
+	_tmp1_ = self->priv->media_context;
 #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = search_condition_media_type_get_context (media);
+	_tmp2_ = search_condition_media_type_get_context (media);
 #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_);
 #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->media_type;
+	_tmp4_ = self->priv->media_type;
 #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_media_type_get_media_type (media);
+	_tmp5_ = search_condition_media_type_get_media_type (media);
 #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp6_);
 #line 283 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (media);
-#line 3817 "SavedSearchDialog.c"
+#line 4020 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base) {
+static gboolean
+saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowMediaType * self;
 	gboolean result = FALSE;
 #line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3826,11 +4031,13 @@ static gboolean saved_search_dialog_search_row_media_type_real_is_complete (Save
 	result = TRUE;
 #line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3830 "SavedSearchDialog.c"
+#line 4035 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) {
+static void
+saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self)
+{
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3841,11 +4048,13 @@ static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDia
 	_tmp1_ = self->priv->parent;
 #line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 3845 "SavedSearchDialog.c"
+#line 4052 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass) {
+static void
+saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass)
+{
 #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_parent_class = g_type_class_peek_parent (klass);
 #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -3860,18 +4069,22 @@ static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDia
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_media_type_real_populate;
 #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_media_type_real_is_complete;
-#line 3864 "SavedSearchDialog.c"
+#line 4073 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) {
+static void
+saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self)
+{
 #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self);
-#line 3871 "SavedSearchDialog.c"
+#line 4082 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj) {
+static void
+saved_search_dialog_search_row_media_type_finalize (SavedSearchDialogSearchRow * obj)
+{
 	SavedSearchDialogSearchRowMediaType * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
@@ -3901,11 +4114,13 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj);
-#line 3905 "SavedSearchDialog.c"
+#line 4118 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_media_type_get_type (void) {
+static GType
+saved_search_dialog_search_row_media_type_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_media_type_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_media_type_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowMediaTypeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_media_type_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowMediaType), 0, (GInstanceInitFunc) saved_search_dialog_search_row_media_type_instance_init, NULL };
@@ -3917,17 +4132,23 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) {
 }
 
 
-static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                           gpointer self)
+{
 #line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self);
-#line 3924 "SavedSearchDialog.c"
+#line 4142 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowModified*
+saved_search_dialog_search_row_modified_construct (GType object_type,
+                                                   SavedSearchDialogSearchRowContainer* parent)
+{
 	SavedSearchDialogSearchRowModified* self = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	GtkComboBoxText* _tmp3_;
 	GtkComboBoxText* _tmp4_;
@@ -3938,115 +4159,116 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi
 	GtkComboBoxText* _tmp9_;
 	GtkComboBoxText* _tmp10_;
 	GtkComboBoxText* _tmp11_;
-	GtkComboBoxText* _tmp12_;
+	GtkBox* _tmp12_;
 	GtkBox* _tmp13_;
-	GtkBox* _tmp14_;
-	GtkComboBoxText* _tmp15_;
-	GtkBox* _tmp16_;
-	GtkComboBoxText* _tmp17_;
-	GtkBox* _tmp18_;
+	GtkComboBoxText* _tmp14_;
+	GtkBox* _tmp15_;
+	GtkComboBoxText* _tmp16_;
+	GtkBox* _tmp17_;
 #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowModified*) saved_search_dialog_search_row_construct (object_type);
 #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = parent;
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
+	_tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent);
 #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->parent = _tmp1_;
+	self->priv->parent = _tmp0_;
 #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_context);
 #line 309 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->modified_context = _tmp2_;
+	self->priv->modified_context = _tmp1_;
 #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->modified_context;
+	_tmp2_ = self->priv->modified_context;
 #line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _ ("has"));
+	gtk_combo_box_text_append_text (_tmp2_, _ ("has"));
 #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->modified_context;
+	_tmp3_ = self->priv->modified_context;
 #line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp4_, _ ("has no"));
+	gtk_combo_box_text_append_text (_tmp3_, _ ("has no"));
 #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->modified_context;
+	_tmp4_ = self->priv->modified_context;
 #line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->modified_context;
+	_tmp5_ = self->priv->modified_context;
 #line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
 #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp6_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp6_);
 #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
 #line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->modified_state = _tmp7_;
+	self->priv->modified_state = _tmp6_;
 #line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->modified_state;
+	_tmp7_ = self->priv->modified_state;
 #line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp8_, _ ("modifications"));
+	gtk_combo_box_text_append_text (_tmp7_, _ ("modifications"));
 #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->modified_state;
+	_tmp8_ = self->priv->modified_state;
 #line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp9_, _ ("internal modifications"));
+	gtk_combo_box_text_append_text (_tmp8_, _ ("internal modifications"));
 #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = self->priv->modified_state;
+	_tmp9_ = self->priv->modified_state;
 #line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp10_, _ ("external modifications"));
+	gtk_combo_box_text_append_text (_tmp9_, _ ("external modifications"));
 #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->modified_state;
+	_tmp10_ = self->priv->modified_state;
 #line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->modified_state;
+	_tmp11_ = self->priv->modified_state;
 #line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
 #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp12_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp13_);
+	g_object_ref_sink (_tmp12_);
 #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 322 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp13_;
+	self->priv->box = _tmp12_;
 #line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = self->priv->box;
+	_tmp13_ = self->priv->box;
 #line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->modified_context;
+	_tmp14_ = self->priv->modified_context;
 #line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = self->priv->box;
+	_tmp15_ = self->priv->box;
 #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = self->priv->modified_state;
+	_tmp16_ = self->priv->modified_state;
 #line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->box;
+	_tmp17_ = self->priv->box;
 #line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
 #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4039 "SavedSearchDialog.c"
+#line 4257 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowModified*
+saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent)
+{
 #line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent);
-#line 4046 "SavedSearchDialog.c"
+#line 4266 "SavedSearchDialog.c"
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base) {
+static GtkWidget*
+saved_search_dialog_search_row_modified_real_get_widget (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowModified * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -4061,102 +4283,97 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved
 	result = _tmp1_;
 #line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4065 "SavedSearchDialog.c"
+#line 4287 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_condition (SavedSearchDialogSearchRow* base) {
+static SearchCondition*
+saved_search_dialog_search_row_modified_real_get_search_condition (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowModified * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SearchConditionSearchType _tmp1_;
 	SearchConditionModifiedContext context = 0;
-	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
+	GtkComboBoxText* _tmp1_;
 	SearchConditionModifiedState state = 0;
-	GtkComboBoxText* _tmp4_;
-	gint _tmp5_;
+	GtkComboBoxText* _tmp2_;
 	SearchConditionModified* c = NULL;
-	SearchConditionModified* _tmp6_;
+	SearchConditionModified* _tmp3_;
 #line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
 #line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
 #line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_type = _tmp1_;
+	search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
 #line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->modified_context;
-#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp1_ = self->priv->modified_context;
 #line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	context = (SearchConditionModifiedContext) _tmp3_;
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->modified_state;
+	context = (SearchConditionModifiedContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp2_ = self->priv->modified_state;
 #line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	state = (SearchConditionModifiedState) _tmp5_;
+	state = (SearchConditionModifiedState) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
 #line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_modified_new (search_type, context, state);
+	_tmp3_ = search_condition_modified_new (search_type, context, state);
 #line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	c = _tmp6_;
+	c = _tmp3_;
 #line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4111 "SavedSearchDialog.c"
+#line 4326 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
+static void
+saved_search_dialog_search_row_modified_real_populate (SavedSearchDialogSearchRow* base,
+                                                       SearchCondition* sc)
+{
 	SavedSearchDialogSearchRowModified * self;
 	SearchConditionModified* scm = NULL;
-	SearchCondition* _tmp0_;
-	SearchConditionModified* _tmp1_;
-	GtkComboBoxText* _tmp2_;
+	SearchConditionModified* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	SearchConditionModifiedState _tmp2_;
 	SearchConditionModifiedState _tmp3_;
-	SearchConditionModifiedState _tmp4_;
-	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp4_;
+	SearchConditionModifiedContext _tmp5_;
 	SearchConditionModifiedContext _tmp6_;
-	SearchConditionModifiedContext _tmp7_;
 #line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
 #line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
 #line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = sc;
-#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp0_) : NULL);
+	_tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) sc) : NULL);
 #line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	scm = _tmp1_;
+	scm = _tmp0_;
 #line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (scm != NULL, "scm != null");
 #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->modified_state;
+	_tmp1_ = self->priv->modified_state;
 #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = search_condition_modified_get_state (scm);
+	_tmp2_ = search_condition_modified_get_state (scm);
 #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_);
 #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->modified_context;
+	_tmp4_ = self->priv->modified_context;
 #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_modified_get_context (scm);
+	_tmp5_ = search_condition_modified_get_context (scm);
 #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp6_);
 #line 345 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (scm);
-#line 4156 "SavedSearchDialog.c"
+#line 4371 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base) {
+static gboolean
+saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowModified * self;
 	gboolean result = FALSE;
 #line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4165,11 +4382,13 @@ static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedS
 	result = TRUE;
 #line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4169 "SavedSearchDialog.c"
+#line 4386 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) {
+static void
+saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self)
+{
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4180,11 +4399,13 @@ static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialo
 	_tmp1_ = self->priv->parent;
 #line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 4184 "SavedSearchDialog.c"
+#line 4403 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass) {
+static void
+saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass)
+{
 #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_parent_class = g_type_class_peek_parent (klass);
 #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4199,18 +4420,22 @@ static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialo
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_modified_real_populate;
 #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_modified_real_is_complete;
-#line 4203 "SavedSearchDialog.c"
+#line 4424 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) {
+static void
+saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self)
+{
 #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self);
-#line 4210 "SavedSearchDialog.c"
+#line 4433 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj) {
+static void
+saved_search_dialog_search_row_modified_finalize (SavedSearchDialogSearchRow * obj)
+{
 	SavedSearchDialogSearchRowModified * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
@@ -4240,11 +4465,13 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj);
-#line 4244 "SavedSearchDialog.c"
+#line 4469 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_modified_get_type (void) {
+static GType
+saved_search_dialog_search_row_modified_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_modified_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_modified_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowModifiedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_modified_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowModified), 0, (GInstanceInitFunc) saved_search_dialog_search_row_modified_instance_init, NULL };
@@ -4256,109 +4483,116 @@ static GType saved_search_dialog_search_row_modified_get_type (void) {
 }
 
 
-static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                          gpointer self)
+{
 #line 384 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self);
-#line 4263 "SavedSearchDialog.c"
+#line 4493 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowFlagged*
+saved_search_dialog_search_row_flagged_construct (GType object_type,
+                                                  SavedSearchDialogSearchRowContainer* parent)
+{
 	SavedSearchDialogSearchRowFlagged* self = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	GtkComboBoxText* _tmp3_;
 	GtkComboBoxText* _tmp4_;
 	GtkComboBoxText* _tmp5_;
-	GtkComboBoxText* _tmp6_;
+	GtkBox* _tmp6_;
 	GtkBox* _tmp7_;
-	GtkBox* _tmp8_;
+	GtkLabel* _tmp8_;
 	GtkLabel* _tmp9_;
-	GtkLabel* _tmp10_;
-	GtkBox* _tmp11_;
-	GtkComboBoxText* _tmp12_;
-	GtkBox* _tmp13_;
+	GtkBox* _tmp10_;
+	GtkComboBoxText* _tmp11_;
+	GtkBox* _tmp12_;
 #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowFlagged*) saved_search_dialog_search_row_construct (object_type);
 #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = parent;
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
+	_tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent);
 #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->parent = _tmp1_;
+	self->priv->parent = _tmp0_;
 #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->flagged_state);
 #line 371 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->flagged_state = _tmp2_;
+	self->priv->flagged_state = _tmp1_;
 #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->flagged_state;
+	_tmp2_ = self->priv->flagged_state;
 #line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _ ("flagged"));
+	gtk_combo_box_text_append_text (_tmp2_, _ ("flagged"));
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->flagged_state;
+	_tmp3_ = self->priv->flagged_state;
 #line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp4_, _ ("not flagged"));
+	gtk_combo_box_text_append_text (_tmp3_, _ ("not flagged"));
 #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->flagged_state;
+	_tmp4_ = self->priv->flagged_state;
 #line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->flagged_state;
+	_tmp5_ = self->priv->flagged_state;
 #line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
 #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp6_);
 #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 377 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp7_;
+	self->priv->box = _tmp6_;
 #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->box;
+	_tmp7_ = self->priv->box;
 #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = (GtkLabel*) gtk_label_new (_ ("is"));
+	_tmp8_ = (GtkLabel*) gtk_label_new (_ ("is"));
 #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp8_);
 #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->box;
+	_tmp10_ = self->priv->box;
 #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->flagged_state;
+	_tmp11_ = self->priv->flagged_state;
 #line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->box;
+	_tmp12_ = self->priv->box;
 #line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
 #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4351 "SavedSearchDialog.c"
+#line 4581 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowFlagged*
+saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent)
+{
 #line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent);
-#line 4358 "SavedSearchDialog.c"
+#line 4590 "SavedSearchDialog.c"
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base) {
+static GtkWidget*
+saved_search_dialog_search_row_flagged_real_get_widget (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowFlagged * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -4373,82 +4607,80 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS
 	result = _tmp1_;
 #line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4377 "SavedSearchDialog.c"
+#line 4611 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_condition (SavedSearchDialogSearchRow* base) {
+static SearchCondition*
+saved_search_dialog_search_row_flagged_real_get_search_condition (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowFlagged * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SearchConditionSearchType _tmp1_;
 	SearchConditionFlaggedState state = 0;
-	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
+	GtkComboBoxText* _tmp1_;
 	SearchConditionFlagged* c = NULL;
-	SearchConditionFlagged* _tmp4_;
+	SearchConditionFlagged* _tmp2_;
 #line 391 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
 #line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
 #line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_type = _tmp1_;
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->flagged_state;
+	search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
 #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp1_ = self->priv->flagged_state;
 #line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	state = (SearchConditionFlaggedState) _tmp3_;
+	state = (SearchConditionFlaggedState) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = search_condition_flagged_new (search_type, state);
+	_tmp2_ = search_condition_flagged_new (search_type, state);
 #line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	c = _tmp4_;
+	c = _tmp2_;
 #line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4414 "SavedSearchDialog.c"
+#line 4644 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
+static void
+saved_search_dialog_search_row_flagged_real_populate (SavedSearchDialogSearchRow* base,
+                                                      SearchCondition* sc)
+{
 	SavedSearchDialogSearchRowFlagged * self;
 	SearchConditionFlagged* f = NULL;
-	SearchCondition* _tmp0_;
-	SearchConditionFlagged* _tmp1_;
-	GtkComboBoxText* _tmp2_;
+	SearchConditionFlagged* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	SearchConditionFlaggedState _tmp2_;
 	SearchConditionFlaggedState _tmp3_;
-	SearchConditionFlaggedState _tmp4_;
 #line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
 #line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
 #line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = sc;
+	_tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) sc) : NULL);
 #line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp0_) : NULL);
-#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	f = _tmp1_;
+	f = _tmp0_;
 #line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (f != NULL, "f != null");
 #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->flagged_state;
+	_tmp1_ = self->priv->flagged_state;
 #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = search_condition_flagged_get_state (f);
+	_tmp2_ = search_condition_flagged_get_state (f);
 #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_);
 #line 398 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (f);
-#line 4448 "SavedSearchDialog.c"
+#line 4678 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base) {
+static gboolean
+saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowFlagged * self;
 	gboolean result = FALSE;
 #line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4457,11 +4689,13 @@ static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSe
 	result = TRUE;
 #line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4461 "SavedSearchDialog.c"
+#line 4693 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) {
+static void
+saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self)
+{
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4472,11 +4706,13 @@ static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialog
 	_tmp1_ = self->priv->parent;
 #line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 4476 "SavedSearchDialog.c"
+#line 4710 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass) {
+static void
+saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass)
+{
 #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_parent_class = g_type_class_peek_parent (klass);
 #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4491,18 +4727,22 @@ static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialog
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_flagged_real_populate;
 #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_flagged_real_is_complete;
-#line 4495 "SavedSearchDialog.c"
+#line 4731 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) {
+static void
+saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self)
+{
 #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self);
-#line 4502 "SavedSearchDialog.c"
+#line 4740 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj) {
+static void
+saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSearchRow * obj)
+{
 	SavedSearchDialogSearchRowFlagged * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
@@ -4522,11 +4762,13 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 361 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj);
-#line 4526 "SavedSearchDialog.c"
+#line 4766 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_flagged_get_type (void) {
+static GType
+saved_search_dialog_search_row_flagged_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_flagged_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_flagged_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowFlaggedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_flagged_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowFlagged), 0, (GInstanceInitFunc) saved_search_dialog_search_row_flagged_instance_init, NULL };
@@ -4538,32 +4780,38 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) {
 }
 
 
-static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                         gpointer self)
+{
 #line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self);
-#line 4545 "SavedSearchDialog.c"
+#line 4790 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowRating*
+saved_search_dialog_search_row_rating_construct (GType object_type,
+                                                 SavedSearchDialogSearchRowContainer* parent)
+{
 	SavedSearchDialogSearchRowRating* self = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp1_;
 	GtkComboBoxText* _tmp2_;
-	GtkComboBoxText* _tmp3_;
-	const gchar* _tmp4_;
-	GtkComboBoxText* _tmp5_;
-	const gchar* _tmp6_;
-	GtkComboBoxText* _tmp7_;
-	const gchar* _tmp8_;
-	GtkComboBoxText* _tmp9_;
-	const gchar* _tmp10_;
-	GtkComboBoxText* _tmp11_;
-	const gchar* _tmp12_;
-	GtkComboBoxText* _tmp13_;
-	const gchar* _tmp14_;
-	GtkComboBoxText* _tmp15_;
-	const gchar* _tmp16_;
+	const gchar* _tmp3_;
+	GtkComboBoxText* _tmp4_;
+	const gchar* _tmp5_;
+	GtkComboBoxText* _tmp6_;
+	const gchar* _tmp7_;
+	GtkComboBoxText* _tmp8_;
+	const gchar* _tmp9_;
+	GtkComboBoxText* _tmp10_;
+	const gchar* _tmp11_;
+	GtkComboBoxText* _tmp12_;
+	const gchar* _tmp13_;
+	GtkComboBoxText* _tmp14_;
+	const gchar* _tmp15_;
+	GtkComboBoxText* _tmp16_;
 	GtkComboBoxText* _tmp17_;
 	GtkComboBoxText* _tmp18_;
 	GtkComboBoxText* _tmp19_;
@@ -4571,164 +4819,165 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c
 	GtkComboBoxText* _tmp21_;
 	GtkComboBoxText* _tmp22_;
 	GtkComboBoxText* _tmp23_;
-	GtkComboBoxText* _tmp24_;
+	GtkBox* _tmp24_;
 	GtkBox* _tmp25_;
-	GtkBox* _tmp26_;
+	GtkLabel* _tmp26_;
 	GtkLabel* _tmp27_;
-	GtkLabel* _tmp28_;
-	GtkBox* _tmp29_;
-	GtkComboBoxText* _tmp30_;
-	GtkBox* _tmp31_;
-	GtkComboBoxText* _tmp32_;
-	GtkBox* _tmp33_;
+	GtkBox* _tmp28_;
+	GtkComboBoxText* _tmp29_;
+	GtkBox* _tmp30_;
+	GtkComboBoxText* _tmp31_;
+	GtkBox* _tmp32_;
 #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowRating*) saved_search_dialog_search_row_construct (object_type);
 #line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = parent;
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
+	_tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent);
 #line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->parent = _tmp1_;
+	self->priv->parent = _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->rating);
 #line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->rating = _tmp2_;
+	self->priv->rating = _tmp1_;
 #line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->rating;
+	_tmp2_ = self->priv->rating;
 #line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = resources_rating_combo_box (RATING_REJECTED);
+	_tmp3_ = resources_rating_combo_box (RATING_REJECTED);
 #line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
+	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
 #line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->rating;
+	_tmp4_ = self->priv->rating;
 #line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = resources_rating_combo_box (RATING_UNRATED);
+	_tmp5_ = resources_rating_combo_box (RATING_UNRATED);
 #line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
+	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
 #line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->rating;
+	_tmp6_ = self->priv->rating;
 #line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = resources_rating_combo_box (RATING_ONE);
+	_tmp7_ = resources_rating_combo_box (RATING_ONE);
 #line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
+	gtk_combo_box_text_append_text (_tmp6_, _tmp7_);
 #line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->rating;
+	_tmp8_ = self->priv->rating;
 #line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = resources_rating_combo_box (RATING_TWO);
+	_tmp9_ = resources_rating_combo_box (RATING_TWO);
 #line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
+	gtk_combo_box_text_append_text (_tmp8_, _tmp9_);
 #line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = self->priv->rating;
+	_tmp10_ = self->priv->rating;
 #line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = resources_rating_combo_box (RATING_THREE);
+	_tmp11_ = resources_rating_combo_box (RATING_THREE);
 #line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
+	gtk_combo_box_text_append_text (_tmp10_, _tmp11_);
 #line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->rating;
+	_tmp12_ = self->priv->rating;
 #line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = resources_rating_combo_box (RATING_FOUR);
+	_tmp13_ = resources_rating_combo_box (RATING_FOUR);
 #line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp13_, _tmp14_);
+	gtk_combo_box_text_append_text (_tmp12_, _tmp13_);
 #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->rating;
+	_tmp14_ = self->priv->rating;
 #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = resources_rating_combo_box (RATING_FIVE);
+	_tmp15_ = resources_rating_combo_box (RATING_FIVE);
 #line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp15_, _tmp16_);
+	gtk_combo_box_text_append_text (_tmp14_, _tmp15_);
 #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = self->priv->rating;
+	_tmp16_ = self->priv->rating;
 #line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->rating;
+	_tmp17_ = self->priv->rating;
 #line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
 #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp18_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp19_);
+	g_object_ref_sink (_tmp18_);
 #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
 #line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->context = _tmp19_;
+	self->priv->context = _tmp18_;
 #line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->context;
+	_tmp19_ = self->priv->context;
 #line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp20_, _ ("and higher"));
+	gtk_combo_box_text_append_text (_tmp19_, _ ("and higher"));
 #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = self->priv->context;
+	_tmp20_ = self->priv->context;
 #line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp21_, _ ("only"));
+	gtk_combo_box_text_append_text (_tmp20_, _ ("only"));
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->context;
+	_tmp21_ = self->priv->context;
 #line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp22_, _ ("and lower"));
+	gtk_combo_box_text_append_text (_tmp21_, _ ("and lower"));
 #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->context;
+	_tmp22_ = self->priv->context;
 #line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->context;
+	_tmp23_ = self->priv->context;
 #line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
 #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp25_);
+	g_object_ref_sink (_tmp24_);
 #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 442 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp25_;
+	self->priv->box = _tmp24_;
 #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->box;
+	_tmp25_ = self->priv->box;
 #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = (GtkLabel*) gtk_label_new (_ ("is"));
+	_tmp26_ = (GtkLabel*) gtk_label_new (_ ("is"));
 #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp27_);
+	g_object_ref_sink (_tmp26_);
 #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = _tmp27_;
+	_tmp27_ = _tmp26_;
 #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp28_);
+	_g_object_unref0 (_tmp27_);
 #line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = self->priv->box;
+	_tmp28_ = self->priv->box;
 #line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = self->priv->rating;
+	_tmp29_ = self->priv->rating;
 #line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = self->priv->box;
+	_tmp30_ = self->priv->box;
 #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = self->priv->context;
+	_tmp31_ = self->priv->context;
 #line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp33_ = self->priv->box;
+	_tmp32_ = self->priv->box;
 #line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
 #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4721 "SavedSearchDialog.c"
+#line 4966 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowRating*
+saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent)
+{
 #line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent);
-#line 4728 "SavedSearchDialog.c"
+#line 4975 "SavedSearchDialog.c"
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base) {
+static GtkWidget*
+saved_search_dialog_search_row_rating_real_get_widget (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowRating * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -4743,102 +4992,97 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe
 	result = _tmp1_;
 #line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4747 "SavedSearchDialog.c"
+#line 4996 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_condition (SavedSearchDialogSearchRow* base) {
+static SearchCondition*
+saved_search_dialog_search_row_rating_real_get_search_condition (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowRating * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SearchConditionSearchType _tmp1_;
 	Rating search_rating = 0;
-	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
+	GtkComboBoxText* _tmp1_;
 	SearchConditionRatingContext search_context = 0;
-	GtkComboBoxText* _tmp4_;
-	gint _tmp5_;
+	GtkComboBoxText* _tmp2_;
 	SearchConditionRating* c = NULL;
-	SearchConditionRating* _tmp6_;
+	SearchConditionRating* _tmp3_;
 #line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
 #line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
 #line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_type = _tmp1_;
+	search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
 #line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->rating;
-#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp1_ = self->priv->rating;
 #line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_rating = ((Rating) _tmp3_) + RATING_REJECTED;
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->context;
+	search_rating = ((Rating) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox))) + RATING_REJECTED;
 #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp2_ = self->priv->context;
 #line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_context = (SearchConditionRatingContext) _tmp5_;
+	search_context = (SearchConditionRatingContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
 #line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_rating_new (search_type, search_rating, search_context);
+	_tmp3_ = search_condition_rating_new (search_type, search_rating, search_context);
 #line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	c = _tmp6_;
+	c = _tmp3_;
 #line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4793 "SavedSearchDialog.c"
+#line 5035 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
+static void
+saved_search_dialog_search_row_rating_real_populate (SavedSearchDialogSearchRow* base,
+                                                     SearchCondition* sc)
+{
 	SavedSearchDialogSearchRowRating * self;
 	SearchConditionRating* r = NULL;
-	SearchCondition* _tmp0_;
-	SearchConditionRating* _tmp1_;
-	GtkComboBoxText* _tmp2_;
+	SearchConditionRating* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	SearchConditionRatingContext _tmp2_;
 	SearchConditionRatingContext _tmp3_;
-	SearchConditionRatingContext _tmp4_;
-	GtkComboBoxText* _tmp5_;
+	GtkComboBoxText* _tmp4_;
+	Rating _tmp5_;
 	Rating _tmp6_;
-	Rating _tmp7_;
 #line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
 #line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
 #line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = sc;
+	_tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) sc) : NULL);
 #line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp0_) : NULL);
-#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	r = _tmp1_;
+	r = _tmp0_;
 #line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (r != NULL, "r != null");
 #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->context;
+	_tmp1_ = self->priv->context;
 #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = search_condition_rating_get_context (r);
+	_tmp2_ = search_condition_rating_get_context (r);
 #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_);
 #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->rating;
+	_tmp4_ = self->priv->rating;
 #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = search_condition_rating_get_rating (r);
+	_tmp5_ = search_condition_rating_get_rating (r);
 #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED));
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp6_ - RATING_REJECTED));
 #line 466 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (r);
-#line 4838 "SavedSearchDialog.c"
+#line 5080 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base) {
+static gboolean
+saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowRating * self;
 	gboolean result = FALSE;
 #line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4847,11 +5091,13 @@ static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSea
 	result = TRUE;
 #line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4851 "SavedSearchDialog.c"
+#line 5095 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) {
+static void
+saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self)
+{
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4862,11 +5108,13 @@ static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogS
 	_tmp1_ = self->priv->parent;
 #line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
-#line 4866 "SavedSearchDialog.c"
+#line 5112 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass) {
+static void
+saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass)
+{
 #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_parent_class = g_type_class_peek_parent (klass);
 #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -4881,18 +5129,22 @@ static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogS
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_rating_real_populate;
 #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_rating_real_is_complete;
-#line 4885 "SavedSearchDialog.c"
+#line 5133 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) {
+static void
+saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self)
+{
 #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self);
-#line 4892 "SavedSearchDialog.c"
+#line 5142 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj) {
+static void
+saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSearchRow * obj)
+{
 	SavedSearchDialogSearchRowRating * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
@@ -4922,11 +5174,13 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj);
-#line 4926 "SavedSearchDialog.c"
+#line 5178 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_rating_get_type (void) {
+static GType
+saved_search_dialog_search_row_rating_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_rating_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_rating_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowRatingClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_rating_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowRating), 0, (GInstanceInitFunc) saved_search_dialog_search_row_rating_instance_init, NULL };
@@ -4938,31 +5192,43 @@ static GType saved_search_dialog_search_row_rating_get_type (void) {
 }
 
 
-static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                       gpointer self)
+{
 #line 528 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self);
-#line 4945 "SavedSearchDialog.c"
+#line 5202 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                        gpointer self)
+{
 #line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 4952 "SavedSearchDialog.c"
+#line 5212 "SavedSearchDialog.c"
 }
 
 
-static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                        gpointer self)
+{
 #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 4959 "SavedSearchDialog.c"
+#line 5222 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_construct (GType object_type, SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowDate*
+saved_search_dialog_search_row_date_construct (GType object_type,
+                                               SavedSearchDialogSearchRowContainer* parent)
+{
 	SavedSearchDialogSearchRowDate* self = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SavedSearchDialogSearchRowContainer* _tmp1_;
+	GtkComboBoxText* _tmp1_;
 	GtkComboBoxText* _tmp2_;
 	GtkComboBoxText* _tmp3_;
 	GtkComboBoxText* _tmp4_;
@@ -4970,294 +5236,294 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const
 	GtkComboBoxText* _tmp6_;
 	GtkComboBoxText* _tmp7_;
 	GtkComboBoxText* _tmp8_;
-	GtkComboBoxText* _tmp9_;
+	GtkCalendar* _tmp9_;
 	GtkCalendar* _tmp10_;
-	GtkCalendar* _tmp11_;
+	GtkButton* _tmp11_;
 	GtkButton* _tmp12_;
 	GtkButton* _tmp13_;
 	GtkButton* _tmp14_;
-	GtkButton* _tmp15_;
-	GtkLabel* _tmp16_;
+	GtkLabel* _tmp15_;
+	GtkBox* _tmp16_;
 	GtkBox* _tmp17_;
-	GtkBox* _tmp18_;
-	GtkComboBoxText* _tmp19_;
-	GtkBox* _tmp20_;
-	GtkButton* _tmp21_;
-	GtkBox* _tmp22_;
-	GtkLabel* _tmp23_;
-	GtkBox* _tmp24_;
-	GtkButton* _tmp25_;
-	GtkBox* _tmp26_;
+	GtkComboBoxText* _tmp18_;
+	GtkBox* _tmp19_;
+	GtkButton* _tmp20_;
+	GtkBox* _tmp21_;
+	GtkLabel* _tmp22_;
+	GtkBox* _tmp23_;
+	GtkButton* _tmp24_;
+	GtkBox* _tmp25_;
 #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
 #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowDate*) saved_search_dialog_search_row_construct (object_type);
 #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = parent;
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
+	_tmp0_ = _saved_search_dialog_search_row_container_ref0 (parent);
 #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->parent = _tmp1_;
+	self->priv->parent = _tmp0_;
 #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+	_tmp1_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
 #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
 #line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->context = _tmp2_;
+	self->priv->context = _tmp1_;
 #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->context;
+	_tmp2_ = self->priv->context;
 #line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp3_, _ ("is exactly"));
+	gtk_combo_box_text_append_text (_tmp2_, _ ("is exactly"));
 #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = self->priv->context;
+	_tmp3_ = self->priv->context;
 #line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp4_, _ ("is after"));
+	gtk_combo_box_text_append_text (_tmp3_, _ ("is after"));
 #line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = self->priv->context;
+	_tmp4_ = self->priv->context;
 #line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp5_, _ ("is before"));
+	gtk_combo_box_text_append_text (_tmp4_, _ ("is before"));
 #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->context;
+	_tmp5_ = self->priv->context;
 #line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp6_, _ ("is between"));
+	gtk_combo_box_text_append_text (_tmp5_, _ ("is between"));
 #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = self->priv->context;
+	_tmp6_ = self->priv->context;
 #line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp7_, _ ("is not set"));
+	gtk_combo_box_text_append_text (_tmp6_, _ ("is not set"));
 #line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = self->priv->context;
+	_tmp7_ = self->priv->context;
 #line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = self->priv->context;
+	_tmp8_ = self->priv->context;
 #line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = (GtkCalendar*) gtk_calendar_new ();
+	_tmp9_ = (GtkCalendar*) gtk_calendar_new ();
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp10_);
+	g_object_ref_sink (_tmp9_);
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
 #line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->cal_one = _tmp10_;
+	self->priv->cal_one = _tmp9_;
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = (GtkCalendar*) gtk_calendar_new ();
+	_tmp10_ = (GtkCalendar*) gtk_calendar_new ();
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp11_);
+	g_object_ref_sink (_tmp10_);
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
 #line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->cal_two = _tmp11_;
+	self->priv->cal_two = _tmp10_;
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = (GtkButton*) gtk_button_new ();
+	_tmp11_ = (GtkButton*) gtk_button_new ();
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp12_);
+	g_object_ref_sink (_tmp11_);
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
 #line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->label_one = _tmp12_;
+	self->priv->label_one = _tmp11_;
 #line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->label_one;
+	_tmp12_ = self->priv->label_one;
 #line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp13_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self);
+	g_signal_connect (_tmp12_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self);
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = (GtkButton*) gtk_button_new ();
+	_tmp13_ = (GtkButton*) gtk_button_new ();
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp14_);
+	g_object_ref_sink (_tmp13_);
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
 #line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->label_two = _tmp14_;
+	self->priv->label_two = _tmp13_;
 #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = self->priv->label_two;
+	_tmp14_ = self->priv->label_two;
 #line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (_tmp15_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self);
+	g_signal_connect (_tmp14_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self);
 #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = (GtkLabel*) gtk_label_new (_ ("and"));
+	_tmp15_ = (GtkLabel*) gtk_label_new (_ ("and"));
 #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp16_);
+	g_object_ref_sink (_tmp15_);
 #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
 #line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->and = _tmp16_;
+	self->priv->and = _tmp15_;
 #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+	_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
 #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp17_);
+	g_object_ref_sink (_tmp16_);
 #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 517 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp17_;
+	self->priv->box = _tmp16_;
 #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->box;
+	_tmp17_ = self->priv->box;
 #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = self->priv->context;
+	_tmp18_ = self->priv->context;
 #line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = self->priv->box;
+	_tmp19_ = self->priv->box;
 #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = self->priv->label_one;
+	_tmp20_ = self->priv->label_one;
 #line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->box;
+	_tmp21_ = self->priv->box;
 #line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->and;
+	_tmp22_ = self->priv->and;
 #line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->box;
+	_tmp23_ = self->priv->box;
 #line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->label_two;
+	_tmp24_ = self->priv->label_two;
 #line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->box;
+	_tmp25_ = self->priv->box;
 #line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
 #line 524 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 5128 "SavedSearchDialog.c"
+#line 5391 "SavedSearchDialog.c"
 }
 
 
-static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) {
+static SavedSearchDialogSearchRowDate*
+saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent)
+{
 #line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent);
-#line 5135 "SavedSearchDialog.c"
+#line 5400 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self) {
+static void
+saved_search_dialog_search_row_date_update_date_labels (SavedSearchDialogSearchRowDate* self)
+{
 	SearchConditionDateContext c = 0;
 	GtkComboBoxText* _tmp0_;
-	gint _tmp1_;
-	SearchConditionDateContext _tmp2_;
-	GtkButton* _tmp13_;
+	SearchConditionDateContext _tmp1_;
+	GtkButton* _tmp12_;
+	GDateTime* _tmp13_;
 	GDateTime* _tmp14_;
-	GDateTime* _tmp15_;
+	gchar* _tmp15_;
 	gchar* _tmp16_;
-	gchar* _tmp17_;
-	GtkButton* _tmp18_;
+	GtkButton* _tmp17_;
+	GDateTime* _tmp18_;
 	GDateTime* _tmp19_;
-	GDateTime* _tmp20_;
+	gchar* _tmp20_;
 	gchar* _tmp21_;
-	gchar* _tmp22_;
 #line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->context;
 #line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	c = (SearchConditionDateContext) _tmp1_;
+	c = (SearchConditionDateContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
 #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = c;
+	_tmp1_ = c;
 #line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
-#line 5166 "SavedSearchDialog.c"
-		GtkButton* _tmp3_;
-		GtkLabel* _tmp4_;
-		GtkButton* _tmp5_;
+	if (_tmp1_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
+#line 5430 "SavedSearchDialog.c"
+		GtkButton* _tmp2_;
+		GtkLabel* _tmp3_;
+		GtkButton* _tmp4_;
 #line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp3_ = self->priv->label_one;
+		_tmp2_ = self->priv->label_one;
 #line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
+		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp4_ = self->priv->and;
+		_tmp3_ = self->priv->and;
 #line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp5_ = self->priv->label_two;
+		_tmp4_ = self->priv->label_two;
 #line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 5182 "SavedSearchDialog.c"
+		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+#line 5446 "SavedSearchDialog.c"
 	} else {
-		SearchConditionDateContext _tmp6_;
+		SearchConditionDateContext _tmp5_;
 #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp6_ = c;
+		_tmp5_ = c;
 #line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) {
-#line 5189 "SavedSearchDialog.c"
-			GtkButton* _tmp7_;
-			GtkLabel* _tmp8_;
-			GtkButton* _tmp9_;
+		if (_tmp5_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) {
+#line 5453 "SavedSearchDialog.c"
+			GtkButton* _tmp6_;
+			GtkLabel* _tmp7_;
+			GtkButton* _tmp8_;
 #line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp7_ = self->priv->label_one;
+			_tmp6_ = self->priv->label_one;
 #line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
 #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp8_ = self->priv->and;
+			_tmp7_ = self->priv->and;
 #line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
+			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp9_ = self->priv->label_two;
+			_tmp8_ = self->priv->label_two;
 #line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 5205 "SavedSearchDialog.c"
+			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
+#line 5469 "SavedSearchDialog.c"
 		} else {
-			GtkButton* _tmp10_;
-			GtkLabel* _tmp11_;
-			GtkButton* _tmp12_;
+			GtkButton* _tmp9_;
+			GtkLabel* _tmp10_;
+			GtkButton* _tmp11_;
 #line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp10_ = self->priv->label_one;
+			_tmp9_ = self->priv->label_one;
 #line 544 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+			gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp11_ = self->priv->and;
+			_tmp10_ = self->priv->and;
 #line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
+			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_tmp12_ = self->priv->label_two;
+			_tmp11_ = self->priv->label_two;
 #line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 5222 "SavedSearchDialog.c"
+			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
+#line 5486 "SavedSearchDialog.c"
 		}
 	}
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = self->priv->label_one;
+	_tmp12_ = self->priv->label_one;
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = saved_search_dialog_search_row_date_get_date_one (self);
+	_tmp13_ = saved_search_dialog_search_row_date_get_date_one (self);
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = g_date_time_format (_tmp15_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
+	_tmp15_ = g_date_time_format (_tmp14_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = _tmp16_;
+	_tmp16_ = _tmp15_;
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_button_set_label (_tmp13_, _tmp17_);
+	gtk_button_set_label (_tmp12_, _tmp16_);
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_free0 (_tmp17_);
+	_g_free0 (_tmp16_);
 #line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_date_time_unref0 (_tmp15_);
+	_g_date_time_unref0 (_tmp14_);
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->label_two;
+	_tmp17_ = self->priv->label_two;
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = saved_search_dialog_search_row_date_get_date_two (self);
+	_tmp18_ = saved_search_dialog_search_row_date_get_date_two (self);
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = _tmp19_;
+	_tmp19_ = _tmp18_;
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = g_date_time_format (_tmp20_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
+	_tmp20_ = g_date_time_format (_tmp19_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = _tmp21_;
+	_tmp21_ = _tmp20_;
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_button_set_label (_tmp18_, _tmp22_);
+	gtk_button_set_label (_tmp17_, _tmp21_);
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_free0 (_tmp22_);
+	_g_free0 (_tmp21_);
 #line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_date_time_unref0 (_tmp20_);
-#line 5257 "SavedSearchDialog.c"
+	_g_date_time_unref0 (_tmp19_);
+#line 5521 "SavedSearchDialog.c"
 }
 
 
-static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base) {
+static GtkWidget*
+saved_search_dialog_search_row_date_real_get_widget (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowDate * self;
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_;
@@ -5272,11 +5538,13 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear
 	result = _tmp1_;
 #line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5276 "SavedSearchDialog.c"
+#line 5542 "SavedSearchDialog.c"
 }
 
 
-static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self) {
+static GDateTime*
+saved_search_dialog_search_row_date_get_date_one (SavedSearchDialogSearchRowDate* self)
+{
 	GDateTime* result = NULL;
 	GtkCalendar* _tmp0_;
 	gint _tmp1_;
@@ -5314,11 +5582,13 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD
 	result = _tmp9_;
 #line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5318 "SavedSearchDialog.c"
+#line 5586 "SavedSearchDialog.c"
 }
 
 
-static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self) {
+static GDateTime*
+saved_search_dialog_search_row_date_get_date_two (SavedSearchDialogSearchRowDate* self)
+{
 	GDateTime* result = NULL;
 	GtkCalendar* _tmp0_;
 	gint _tmp1_;
@@ -5356,20 +5626,17 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD
 	result = _tmp9_;
 #line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5360 "SavedSearchDialog.c"
+#line 5630 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self, GDateTime* date) {
+static void
+saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogSearchRowDate* self,
+                                                  GDateTime* date)
+{
 	GtkCalendar* _tmp0_;
-	GDateTime* _tmp1_;
-	gint _tmp2_;
-	GtkCalendar* _tmp3_;
-	GDateTime* _tmp4_;
-	gint _tmp5_;
-	GtkCalendar* _tmp6_;
-	GDateTime* _tmp7_;
-	gint _tmp8_;
+	GtkCalendar* _tmp1_;
+	GtkCalendar* _tmp2_;
 #line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 566 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5377,41 +5644,26 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS
 #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
 #line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = date;
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->cal_one;
+	g_object_set (_tmp0_, "day", g_date_time_get_day_of_month (date), NULL);
 #line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = date;
+	_tmp1_ = self->priv->cal_one;
 #line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->cal_one;
+	g_object_set (_tmp1_, "month", g_date_time_get_month (date) - 1, NULL);
 #line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = date;
+	_tmp2_ = self->priv->cal_one;
 #line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5402 "SavedSearchDialog.c"
+	g_object_set (_tmp2_, "year", g_date_time_get_year (date), NULL);
+#line 5657 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self, GDateTime* date) {
+static void
+saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogSearchRowDate* self,
+                                                  GDateTime* date)
+{
 	GtkCalendar* _tmp0_;
-	GDateTime* _tmp1_;
-	gint _tmp2_;
-	GtkCalendar* _tmp3_;
-	GDateTime* _tmp4_;
-	gint _tmp5_;
-	GtkCalendar* _tmp6_;
-	GDateTime* _tmp7_;
-	gint _tmp8_;
+	GtkCalendar* _tmp1_;
+	GtkCalendar* _tmp2_;
 #line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 572 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5419,140 +5671,126 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS
 #line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
 #line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = date;
-#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = self->priv->cal_two;
+	g_object_set (_tmp0_, "day", g_date_time_get_day_of_month (date), NULL);
 #line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = date;
+	_tmp1_ = self->priv->cal_two;
 #line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = self->priv->cal_two;
+	g_object_set (_tmp1_, "month", g_date_time_get_month (date) - 1, NULL);
 #line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = date;
+	_tmp2_ = self->priv->cal_two;
 #line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5444 "SavedSearchDialog.c"
+	g_object_set (_tmp2_, "year", g_date_time_get_year (date), NULL);
+#line 5684 "SavedSearchDialog.c"
 }
 
 
-static SearchCondition* saved_search_dialog_search_row_date_real_get_search_condition (SavedSearchDialogSearchRow* base) {
+static SearchCondition*
+saved_search_dialog_search_row_date_real_get_search_condition (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowDate * self;
 	SearchCondition* result = NULL;
 	SearchConditionSearchType search_type = 0;
 	SavedSearchDialogSearchRowContainer* _tmp0_;
-	SearchConditionSearchType _tmp1_;
 	SearchConditionDateContext search_context = 0;
-	GtkComboBoxText* _tmp2_;
-	gint _tmp3_;
+	GtkComboBoxText* _tmp1_;
 	SearchConditionDate* c = NULL;
+	GDateTime* _tmp2_;
+	GDateTime* _tmp3_;
 	GDateTime* _tmp4_;
 	GDateTime* _tmp5_;
-	GDateTime* _tmp6_;
-	GDateTime* _tmp7_;
-	SearchConditionDate* _tmp8_;
-	SearchConditionDate* _tmp9_;
+	SearchConditionDate* _tmp6_;
+	SearchConditionDate* _tmp7_;
 #line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
 #line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
 #line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_type = _tmp1_;
-#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->context;
+	search_type = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
 #line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
+	_tmp1_ = self->priv->context;
 #line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	search_context = (SearchConditionDateContext) _tmp3_;
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = saved_search_dialog_search_row_date_get_date_one (self);
+	search_context = (SearchConditionDateContext) gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = saved_search_dialog_search_row_date_get_date_one (self);
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = saved_search_dialog_search_row_date_get_date_two (self);
+	_tmp3_ = _tmp2_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = saved_search_dialog_search_row_date_get_date_two (self);
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = search_condition_date_new (search_type, search_context, _tmp5_, _tmp7_);
+	_tmp5_ = _tmp4_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = search_condition_date_new (search_type, search_context, _tmp3_, _tmp5_);
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_date_time_unref0 (_tmp7_);
+	_tmp7_ = _tmp6_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp5_);
 #line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	c = _tmp9_;
+	_g_date_time_unref0 (_tmp3_);
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	c = _tmp7_;
 #line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5500 "SavedSearchDialog.c"
+#line 5736 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base, SearchCondition* sc) {
+static void
+saved_search_dialog_search_row_date_real_populate (SavedSearchDialogSearchRow* base,
+                                                   SearchCondition* sc)
+{
 	SavedSearchDialogSearchRowDate * self;
 	SearchConditionDate* cond = NULL;
-	SearchCondition* _tmp0_;
-	SearchConditionDate* _tmp1_;
-	GtkComboBoxText* _tmp2_;
+	SearchConditionDate* _tmp0_;
+	GtkComboBoxText* _tmp1_;
+	SearchConditionDateContext _tmp2_;
 	SearchConditionDateContext _tmp3_;
-	SearchConditionDateContext _tmp4_;
+	GDateTime* _tmp4_;
 	GDateTime* _tmp5_;
 	GDateTime* _tmp6_;
 	GDateTime* _tmp7_;
-	GDateTime* _tmp8_;
 #line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
 #line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
 #line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = sc;
-#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp0_) : NULL);
+	_tmp0_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (sc, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) sc) : NULL);
 #line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	cond = _tmp1_;
+	cond = _tmp0_;
 #line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (cond != NULL, "cond != null");
 #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = self->priv->context;
+	_tmp1_ = self->priv->context;
 #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = search_condition_date_get_context (cond);
+	_tmp2_ = search_condition_date_get_context (cond);
 #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp3_);
 #line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = search_condition_date_get_date_one (cond);
+	_tmp4_ = search_condition_date_get_date_one (cond);
 #line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_date_set_date_one (self, _tmp6_);
+	saved_search_dialog_search_row_date_set_date_one (self, _tmp5_);
 #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp7_ = search_condition_date_get_date_two (cond);
+	_tmp6_ = search_condition_date_get_date_two (cond);
 #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_date_set_date_two (self, _tmp8_);
+	saved_search_dialog_search_row_date_set_date_two (self, _tmp7_);
 #line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (cond);
-#line 5552 "SavedSearchDialog.c"
+#line 5788 "SavedSearchDialog.c"
 }
 
 
-static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base) {
+static gboolean
+saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base)
+{
 	SavedSearchDialogSearchRowDate * self;
 	gboolean result = FALSE;
 #line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5561,11 +5799,13 @@ static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearc
 	result = TRUE;
 #line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5565 "SavedSearchDialog.c"
+#line 5803 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) {
+static void
+saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self)
+{
 	SavedSearchDialogSearchRowContainer* _tmp0_;
 	SavedSearchDialogSearchRowContainer* _tmp1_;
 #line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5578,25 +5818,29 @@ static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSea
 	g_signal_emit (_tmp0_, saved_search_dialog_search_row_container_signals[SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_CHANGED_SIGNAL], 0, _tmp1_);
 #line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5582 "SavedSearchDialog.c"
+#line 5822 "SavedSearchDialog.c"
 }
 
 
-static Block10Data* block10_data_ref (Block10Data* _data10_) {
+static Block10Data*
+block10_data_ref (Block10Data* _data10_)
+{
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&_data10_->_ref_count_);
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _data10_;
-#line 5591 "SavedSearchDialog.c"
+#line 5833 "SavedSearchDialog.c"
 }
 
 
-static void block10_data_unref (void * _userdata_) {
+static void
+block10_data_unref (void * _userdata_)
+{
 	Block10Data* _data10_;
 	_data10_ = (Block10Data*) _userdata_;
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) {
-#line 5600 "SavedSearchDialog.c"
+#line 5844 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowDate* self;
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self = _data10_->self;
@@ -5606,26 +5850,33 @@ static void block10_data_unref (void * _userdata_) {
 		_saved_search_dialog_search_row_unref0 (self);
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_slice_free (Block10Data, _data10_);
-#line 5610 "SavedSearchDialog.c"
+#line 5854 "SavedSearchDialog.c"
 	}
 }
 
 
-static void __lambda14_ (SavedSearchDialogSearchRowDate* self) {
+static void
+__lambda14_ (SavedSearchDialogSearchRowDate* self)
+{
 #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5618 "SavedSearchDialog.c"
+#line 5864 "SavedSearchDialog.c"
 }
 
 
-static void ___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
+static void
+___lambda14__gtk_calendar_day_selected (GtkCalendar* _sender,
+                                        gpointer self)
+{
 #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda14_ ((SavedSearchDialogSearchRowDate*) self);
-#line 5625 "SavedSearchDialog.c"
+#line 5874 "SavedSearchDialog.c"
 }
 
 
-static void __lambda15_ (Block10Data* _data10_) {
+static void
+__lambda15_ (Block10Data* _data10_)
+{
 	SavedSearchDialogSearchRowDate* self;
 	GtkDialog* _tmp0_;
 #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5634,54 +5885,51 @@ static void __lambda15_ (Block10Data* _data10_) {
 	_tmp0_ = _data10_->d;
 #line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
-#line 5638 "SavedSearchDialog.c"
+#line 5889 "SavedSearchDialog.c"
 }
 
 
-static void ___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
+static void
+___lambda15__gtk_calendar_day_selected_double_click (GtkCalendar* _sender,
+                                                     gpointer self)
+{
 #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda15_ (self);
-#line 5645 "SavedSearchDialog.c"
+#line 5899 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self, GtkCalendar* cal) {
+static void
+saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialogSearchRowDate* self,
+                                                    GtkCalendar* cal)
+{
 	Block10Data* _data10_;
 	gint orig_day = 0;
-	GtkCalendar* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	gint _tmp2_;
 	gint orig_month = 0;
-	GtkCalendar* _tmp3_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint orig_year = 0;
 	gint _tmp4_;
 	gint _tmp5_;
-	gint orig_year = 0;
-	GtkCalendar* _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
+	GtkDialog* _tmp6_;
+	GtkDialog* _tmp7_;
+	GtkDialog* _tmp8_;
 	GtkDialog* _tmp9_;
 	GtkDialog* _tmp10_;
-	GtkDialog* _tmp11_;
-	GtkDialog* _tmp12_;
-	GtkDialog* _tmp13_;
-	GtkBox* _tmp14_;
-	GtkCalendar* _tmp15_;
+	GtkBox* _tmp11_;
 	gulong id_1 = 0UL;
-	GtkCalendar* _tmp16_;
-	gulong _tmp17_;
+	gulong _tmp12_;
 	gulong id_2 = 0UL;
-	GtkCalendar* _tmp18_;
-	gulong _tmp19_;
-	GtkDialog* _tmp20_;
+	gulong _tmp13_;
+	GtkDialog* _tmp14_;
 	gint res = 0;
-	GtkDialog* _tmp21_;
-	gint _tmp22_;
-	gint _tmp23_;
-	GtkCalendar* _tmp30_;
-	gulong _tmp31_;
-	GtkCalendar* _tmp32_;
-	gulong _tmp33_;
-	GtkDialog* _tmp34_;
+	GtkDialog* _tmp15_;
+	gint _tmp16_;
+	gulong _tmp20_;
+	gulong _tmp21_;
+	GtkDialog* _tmp22_;
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5693,135 +5941,110 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_->self = saved_search_dialog_search_row_ref (self);
 #line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp0_ = cal;
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_get (_tmp0_, "day", &_tmp1_, NULL);
+	g_object_get (cal, "day", &_tmp0_, NULL);
 #line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	orig_day = _tmp2_;
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp3_ = cal;
+	orig_day = _tmp1_;
 #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
+	g_object_get (cal, "month", &_tmp2_, NULL);
 #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = _tmp2_;
 #line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	orig_month = _tmp5_;
+	orig_month = _tmp3_;
 #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp6_ = cal;
+	g_object_get (cal, "year", &_tmp4_, NULL);
 #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_get (_tmp6_, "year", &_tmp7_, NULL);
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp8_ = _tmp7_;
+	_tmp5_ = _tmp4_;
 #line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	orig_year = _tmp8_;
+	orig_year = _tmp5_;
 #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp9_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL);
+	_tmp6_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL);
 #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp9_);
+	g_object_ref_sink (_tmp6_);
 #line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_data10_->d = _tmp9_;
+	_data10_->d = _tmp6_;
 #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp10_ = _data10_->d;
+	_tmp7_ = _data10_->d;
 #line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE);
+	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_window_get_type (), GtkWindow), TRUE);
 #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp11_ = _data10_->d;
+	_tmp8_ = _data10_->d;
 #line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE);
+	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), FALSE);
 #line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = _data10_->d;
+	_tmp9_ = _data10_->d;
 #line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp13_ = _data10_->d;
+	gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), FALSE);
 #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_);
+	_tmp10_ = _data10_->d;
 #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp15_ = cal;
+	_tmp11_ = gtk_dialog_get_content_area (_tmp10_);
 #line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp16_ = cal;
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (cal, gtk_widget_get_type (), GtkWidget));
 #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda14__gtk_calendar_day_selected, self);
+	_tmp12_ = g_signal_connect (cal, "day-selected", (GCallback) ___lambda14__gtk_calendar_day_selected, self);
 #line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	id_1 = _tmp17_;
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = cal;
+	id_1 = _tmp12_;
 #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda15__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
+	_tmp13_ = g_signal_connect_data (cal, "day-selected-double-click", (GCallback) ___lambda15__gtk_calendar_day_selected_double_click, block10_data_ref (_data10_), (GClosureNotify) block10_data_unref, 0);
 #line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	id_2 = _tmp19_;
+	id_2 = _tmp13_;
 #line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = _data10_->d;
+	_tmp14_ = _data10_->d;
 #line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = _data10_->d;
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = gtk_dialog_run (_tmp21_);
+	_tmp15_ = _data10_->d;
 #line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	res = _tmp22_;
+	res = gtk_dialog_run (_tmp15_);
 #line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = res;
+	_tmp16_ = res;
 #line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 5772 "SavedSearchDialog.c"
-		GtkCalendar* _tmp24_;
-		gint _tmp25_;
-		GtkCalendar* _tmp26_;
-		gint _tmp27_;
-		GtkCalendar* _tmp28_;
-		gint _tmp29_;
-#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp24_ = cal;
+	if (_tmp16_ != ((gint) GTK_RESPONSE_ACCEPT)) {
+#line 6006 "SavedSearchDialog.c"
+		gint _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
 #line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp25_ = orig_day;
+		_tmp17_ = orig_day;
 #line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_object_set (_tmp24_, "day", _tmp25_, NULL);
+		g_object_set (cal, "day", _tmp17_, NULL);
 #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp26_ = cal;
+		_tmp18_ = orig_month;
 #line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp27_ = orig_month;
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_object_set (_tmp26_, "month", _tmp27_, NULL);
-#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp28_ = cal;
+		g_object_set (cal, "month", _tmp18_, NULL);
 #line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp29_ = orig_year;
+		_tmp19_ = orig_year;
 #line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		g_object_set (_tmp28_, "year", _tmp29_, NULL);
-#line 5797 "SavedSearchDialog.c"
+		g_object_set (cal, "year", _tmp19_, NULL);
+#line 6022 "SavedSearchDialog.c"
 	}
 #line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = cal;
-#line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = id_1;
+	_tmp20_ = id_1;
 #line 627 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, G_TYPE_OBJECT, GObject), _tmp31_);
+	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (cal, G_TYPE_OBJECT, GObject), _tmp20_);
 #line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = cal;
+	_tmp21_ = id_2;
 #line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp33_ = id_2;
-#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_);
+	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (cal, G_TYPE_OBJECT, GObject), _tmp21_);
 #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp34_ = _data10_->d;
+	_tmp22_ = _data10_->d;
 #line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
 #line 630 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	block10_data_unref (_data10_);
 #line 604 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data10_ = NULL;
-#line 5821 "SavedSearchDialog.c"
+#line 6042 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) {
+static void
+saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self)
+{
 	GtkCalendar* _tmp0_;
 #line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
@@ -5829,11 +6052,13 @@ static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialo
 	_tmp0_ = self->priv->cal_one;
 #line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 5833 "SavedSearchDialog.c"
+#line 6056 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) {
+static void
+saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self)
+{
 	GtkCalendar* _tmp0_;
 #line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
@@ -5841,11 +6066,13 @@ static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialo
 	_tmp0_ = self->priv->cal_two;
 #line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 5845 "SavedSearchDialog.c"
+#line 6070 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass) {
+static void
+saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass)
+{
 #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_parent_class = g_type_class_peek_parent (klass);
 #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
@@ -5860,18 +6087,22 @@ static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSea
 	((SavedSearchDialogSearchRowClass *) klass)->populate = (void (*) (SavedSearchDialogSearchRow *, SearchCondition*)) saved_search_dialog_search_row_date_real_populate;
 #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = (gboolean (*) (SavedSearchDialogSearchRow *)) saved_search_dialog_search_row_date_real_is_complete;
-#line 5864 "SavedSearchDialog.c"
+#line 6091 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) {
+static void
+saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self)
+{
 #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self);
-#line 5871 "SavedSearchDialog.c"
+#line 6100 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj) {
+static void
+saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearchRow * obj)
+{
 	SavedSearchDialogSearchRowDate * self;
 	GtkComboBoxText* _tmp0_;
 	guint _tmp1_;
@@ -5901,11 +6132,13 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
 #line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj);
-#line 5905 "SavedSearchDialog.c"
+#line 6136 "SavedSearchDialog.c"
 }
 
 
-static GType saved_search_dialog_search_row_date_get_type (void) {
+static GType
+saved_search_dialog_search_row_date_get_type (void)
+{
 	static volatile gsize saved_search_dialog_search_row_date_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_search_row_date_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogSearchRowDateClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_search_row_date_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialogSearchRowDate), 0, (GInstanceInitFunc) saved_search_dialog_search_row_date_instance_init, NULL };
@@ -5917,7 +6150,9 @@ static GType saved_search_dialog_search_row_date_get_type (void) {
 }
 
 
-static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) {
+static void
+saved_search_dialog_class_init (SavedSearchDialogClass * klass)
+{
 	gint SavedSearchDialog_private_offset;
 #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_parent_class = g_type_class_peek_parent (klass);
@@ -5937,11 +6172,13 @@ static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) {
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "search_title", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, search_title));
 #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "row_listbox", FALSE, SavedSearchDialog_private_offset + G_STRUCT_OFFSET (SavedSearchDialogPrivate, row_listbox));
-#line 5941 "SavedSearchDialog.c"
+#line 6176 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
+static void
+saved_search_dialog_instance_init (SavedSearchDialog * self)
+{
 	GeeArrayList* _tmp0_;
 #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self);
@@ -5957,11 +6194,13 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 	self->priv->valid = FALSE;
 #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_init_template (GTK_WIDGET (self));
-#line 5961 "SavedSearchDialog.c"
+#line 6198 "SavedSearchDialog.c"
 }
 
 
-static void saved_search_dialog_finalize (GObject * obj) {
+static void
+saved_search_dialog_finalize (GObject * obj)
+{
 	SavedSearchDialog * self;
 #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog);
@@ -5979,11 +6218,13 @@ static void saved_search_dialog_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->previous_search);
 #line 9 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	G_OBJECT_CLASS (saved_search_dialog_parent_class)->finalize (obj);
-#line 5983 "SavedSearchDialog.c"
+#line 6222 "SavedSearchDialog.c"
 }
 
 
-GType saved_search_dialog_get_type (void) {
+GType
+saved_search_dialog_get_type (void)
+{
 	static volatile gsize saved_search_dialog_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_dialog_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearchDialog), 0, (GInstanceInitFunc) saved_search_dialog_instance_init, NULL };
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 };
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 12966d0..3a38f9e 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -1,4 +1,4 @@
-/* SearchBoolean.c generated by valac 0.36.6, the Vala compiler
+/* SearchBoolean.c generated by valac 0.40.4, the Vala compiler
  * generated from SearchBoolean.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
  */
 /* For specifying whether a search should be ORed (any) or ANDed (all).*/
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -334,6 +335,11 @@ typedef struct _SavedSearchPrivate SavedSearchPrivate;
 
 typedef struct _SavedSearchRow SavedSearchRow;
 typedef struct _SavedSearchRowClass SavedSearchRowClass;
+enum  {
+	SAVED_SEARCH_0_PROPERTY,
+	SAVED_SEARCH_NUM_PROPERTIES
+};
+static GParamSpec* saved_search_properties[SAVED_SEARCH_NUM_PROPERTIES];
 #define _saved_search_row_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_row_unref (var), NULL)))
 typedef struct _SavedSearchRowPrivate SavedSearchRowPrivate;
 
@@ -408,9 +414,9 @@ typedef struct _ParamSpecSavedSearchTable ParamSpecSavedSearchTable;
 enum  {
 	SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL,
 	SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL,
-	SAVED_SEARCH_TABLE_LAST_SIGNAL
+	SAVED_SEARCH_TABLE_NUM_SIGNALS
 };
-static guint saved_search_table_signals[SAVED_SEARCH_TABLE_LAST_SIGNAL] = {0};
+static guint saved_search_table_signals[SAVED_SEARCH_TABLE_NUM_SIGNALS] = {0};
 
 typedef enum  {
 	SEARCH_OPERATOR_ANY = 0,
@@ -732,9 +738,15 @@ gchar* search_operator_to_string (SearchOperator self);
 SearchOperator search_operator_from_string (const gchar* str);
 gpointer search_condition_ref (gpointer instance);
 void search_condition_unref (gpointer instance);
-GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_search_condition (GValue* value, gpointer v_object);
-void value_take_search_condition (GValue* value, gpointer v_object);
+GParamSpec* param_spec_search_condition (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags);
+void value_set_search_condition (GValue* value,
+                                 gpointer v_object);
+void value_take_search_condition (GValue* value,
+                                  gpointer v_object);
 gpointer value_get_search_condition (const GValue* value);
 GType search_condition_get_type (void) G_GNUC_CONST;
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -743,55 +755,73 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType search_condition_search_type_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION, SearchConditionPrivate))
-enum  {
-	SEARCH_CONDITION_DUMMY_PROPERTY
-};
 SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1);
-void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1);
-static gint __lambda13_ (void* a, void* b);
-gint utf8_cs_compare (void* a, void* b);
+void search_condition_search_type_sort_array (SearchConditionSearchType** array,
+                                              int* array_length1);
+static gint __lambda13_ (void* a,
+                  void* b);
+gint utf8_cs_compare (void* a,
+                      void* b);
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
-static gint ___lambda13____compar_fn_t (void* key1, void* key2);
+static gint ___lambda13____compar_fn_t (void* key1,
+                                 void* key2);
 gchar* search_condition_search_type_to_string (SearchConditionSearchType self);
 SearchConditionSearchType search_condition_search_type_from_string (const gchar* str);
-gboolean search_condition_predicate (SearchCondition* self, MediaSource* source);
-static gboolean search_condition_real_predicate (SearchCondition* self, MediaSource* source);
+gboolean search_condition_predicate (SearchCondition* self,
+                                     MediaSource* source);
+static gboolean search_condition_real_predicate (SearchCondition* self,
+                                          MediaSource* source);
 SearchCondition* search_condition_construct (GType object_type);
 SearchConditionSearchType search_condition_get_search_type (SearchCondition* self);
-void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value);
+void search_condition_set_search_type (SearchCondition* self,
+                                       SearchConditionSearchType value);
 static void search_condition_finalize (SearchCondition * obj);
 GType search_condition_text_get_type (void) G_GNUC_CONST;
 GType search_condition_text_context_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_TEXT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_TEXT, SearchConditionTextPrivate))
-enum  {
-	SEARCH_CONDITION_TEXT_DUMMY_PROPERTY
-};
 gchar* search_condition_text_context_to_string (SearchConditionTextContext self);
 SearchConditionTextContext search_condition_text_context_from_string (const gchar* str);
-SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context);
-SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context);
+SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type,
+                                                const gchar* text,
+                                                SearchConditionTextContext context);
+SearchConditionText* search_condition_text_construct (GType object_type,
+                                                      SearchConditionSearchType search_type,
+                                                      const gchar* text,
+                                                      SearchConditionTextContext context);
 gchar* string_remove_diacritics (const gchar* istring);
-static void search_condition_text_set_text (SearchConditionText* self, const gchar* value);
-static void search_condition_text_set_context (SearchConditionText* self, SearchConditionTextContext value);
-static gboolean search_condition_text_string_match (SearchConditionText* self, const gchar* needle, const gchar* haystack);
+static void search_condition_text_set_text (SearchConditionText* self,
+                                     const gchar* value);
+static void search_condition_text_set_context (SearchConditionText* self,
+                                        SearchConditionTextContext value);
+static gboolean search_condition_text_string_match (SearchConditionText* self,
+                                             const gchar* needle,
+                                             const gchar* haystack);
 SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self);
 gboolean is_string_empty (const gchar* s);
-static gboolean search_condition_text_real_predicate (SearchCondition* base, MediaSource* source);
+static gboolean search_condition_text_real_predicate (SearchCondition* base,
+                                               MediaSource* source);
 gchar* media_source_get_title (MediaSource* self);
 const gchar* search_condition_text_get_text (SearchConditionText* self);
 GType tag_get_type (void) G_GNUC_CONST;
 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;
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType container_source_collection_get_type (void) G_GNUC_CONST;
 GType tag_source_collection_get_type (void) G_GNUC_CONST;
-GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self, MediaSource* source);
+GeeList* tag_source_collection_fetch_for_source (TagSourceCollection* self,
+                                                 MediaSource* source);
 gchar* tag_get_searchable_name (Tag* self);
 GType event_source_get_type (void) G_GNUC_CONST;
 GType event_get_type (void) G_GNUC_CONST;
@@ -804,18 +834,23 @@ GType search_condition_media_type_get_type (void) G_GNUC_CONST;
 GType search_condition_media_type_media_type_get_type (void) G_GNUC_CONST;
 GType search_condition_media_type_context_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_MEDIA_TYPE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaTypePrivate))
-enum  {
-	SEARCH_CONDITION_MEDIA_TYPE_DUMMY_PROPERTY
-};
 gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeContext self);
 SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str);
 gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTypeMediaType self);
 SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str);
-SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type);
-SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type);
-static void search_condition_media_type_set_context (SearchConditionMediaType* self, SearchConditionMediaTypeContext value);
-static void search_condition_media_type_set_media_type (SearchConditionMediaType* self, SearchConditionMediaTypeMediaType value);
-static gboolean search_condition_media_type_real_predicate (SearchCondition* base, MediaSource* source);
+SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type,
+                                                           SearchConditionMediaTypeContext context,
+                                                           SearchConditionMediaTypeMediaType media_type);
+SearchConditionMediaType* search_condition_media_type_construct (GType object_type,
+                                                                 SearchConditionSearchType search_type,
+                                                                 SearchConditionMediaTypeContext context,
+                                                                 SearchConditionMediaTypeMediaType media_type);
+static void search_condition_media_type_set_context (SearchConditionMediaType* self,
+                                              SearchConditionMediaTypeContext value);
+static void search_condition_media_type_set_media_type (SearchConditionMediaType* self,
+                                                 SearchConditionMediaTypeMediaType value);
+static gboolean search_condition_media_type_real_predicate (SearchCondition* base,
+                                                     MediaSource* source);
 SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
@@ -827,15 +862,17 @@ static void search_condition_media_type_finalize (SearchCondition * obj);
 GType search_condition_flagged_get_type (void) G_GNUC_CONST;
 GType search_condition_flagged_state_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_FLAGGED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlaggedPrivate))
-enum  {
-	SEARCH_CONDITION_FLAGGED_DUMMY_PROPERTY
-};
 gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState self);
 SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str);
-SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state);
-SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state);
-static void search_condition_flagged_set_state (SearchConditionFlagged* self, SearchConditionFlaggedState value);
-static gboolean search_condition_flagged_real_predicate (SearchCondition* base, MediaSource* source);
+SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type,
+                                                      SearchConditionFlaggedState state);
+SearchConditionFlagged* search_condition_flagged_construct (GType object_type,
+                                                            SearchConditionSearchType search_type,
+                                                            SearchConditionFlaggedState state);
+static void search_condition_flagged_set_state (SearchConditionFlagged* self,
+                                         SearchConditionFlaggedState value);
+static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
+                                                  MediaSource* source);
 SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self);
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
@@ -844,18 +881,23 @@ GType search_condition_modified_get_type (void) G_GNUC_CONST;
 GType search_condition_modified_state_get_type (void) G_GNUC_CONST;
 GType search_condition_modified_context_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_MODIFIED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModifiedPrivate))
-enum  {
-	SEARCH_CONDITION_MODIFIED_DUMMY_PROPERTY
-};
 gchar* search_condition_modified_context_to_string (SearchConditionModifiedContext self);
 SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str);
 gchar* search_condition_modified_state_to_string (SearchConditionModifiedState self);
 SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str);
-SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state);
-SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state);
-static void search_condition_modified_set_context (SearchConditionModified* self, SearchConditionModifiedContext value);
-static void search_condition_modified_set_state (SearchConditionModified* self, SearchConditionModifiedState value);
-static gboolean search_condition_modified_real_predicate (SearchCondition* base, MediaSource* source);
+SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type,
+                                                        SearchConditionModifiedContext context,
+                                                        SearchConditionModifiedState state);
+SearchConditionModified* search_condition_modified_construct (GType object_type,
+                                                              SearchConditionSearchType search_type,
+                                                              SearchConditionModifiedContext context,
+                                                              SearchConditionModifiedState state);
+static void search_condition_modified_set_context (SearchConditionModified* self,
+                                            SearchConditionModifiedContext value);
+static void search_condition_modified_set_state (SearchConditionModified* self,
+                                          SearchConditionModifiedState value);
+static gboolean search_condition_modified_real_predicate (SearchCondition* base,
+                                                   MediaSource* source);
 SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self);
 gboolean photo_has_transformations (Photo* self);
 gboolean photo_has_editable (Photo* self);
@@ -865,16 +907,21 @@ GType search_condition_rating_get_type (void) G_GNUC_CONST;
 GType rating_get_type (void) G_GNUC_CONST;
 GType search_condition_rating_context_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_RATING, SearchConditionRatingPrivate))
-enum  {
-	SEARCH_CONDITION_RATING_DUMMY_PROPERTY
-};
 gchar* search_condition_rating_context_to_string (SearchConditionRatingContext self);
 SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str);
-SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context);
-SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context);
-static void search_condition_rating_set_rating (SearchConditionRating* self, Rating value);
-static void search_condition_rating_set_context (SearchConditionRating* self, SearchConditionRatingContext value);
-static gboolean search_condition_rating_real_predicate (SearchCondition* base, MediaSource* source);
+SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type,
+                                                    Rating rating,
+                                                    SearchConditionRatingContext context);
+SearchConditionRating* search_condition_rating_construct (GType object_type,
+                                                          SearchConditionSearchType search_type,
+                                                          Rating rating,
+                                                          SearchConditionRatingContext context);
+static void search_condition_rating_set_rating (SearchConditionRating* self,
+                                         Rating value);
+static void search_condition_rating_set_context (SearchConditionRating* self,
+                                          SearchConditionRatingContext value);
+static gboolean search_condition_rating_real_predicate (SearchCondition* base,
+                                                 MediaSource* source);
 Rating media_source_get_rating (MediaSource* self);
 SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self);
 Rating search_condition_rating_get_rating (SearchConditionRating* self);
@@ -882,17 +929,25 @@ static void search_condition_rating_finalize (SearchCondition * obj);
 GType search_condition_date_get_type (void) G_GNUC_CONST;
 GType search_condition_date_context_get_type (void) G_GNUC_CONST;
 #define SEARCH_CONDITION_DATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SEARCH_CONDITION_DATE, SearchConditionDatePrivate))
-enum  {
-	SEARCH_CONDITION_DATE_DUMMY_PROPERTY
-};
 gchar* search_condition_date_context_to_string (SearchConditionDateContext self);
 SearchConditionDateContext search_condition_date_context_from_string (const gchar* str);
-SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two);
-SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two);
-static void search_condition_date_set_context (SearchConditionDate* self, SearchConditionDateContext value);
-static void search_condition_date_set_date_one (SearchConditionDate* self, GDateTime* value);
-static void search_condition_date_set_date_two (SearchConditionDate* self, GDateTime* value);
-static gboolean search_condition_date_real_predicate (SearchCondition* base, MediaSource* source);
+SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type,
+                                                SearchConditionDateContext context,
+                                                GDateTime* date_one,
+                                                GDateTime* date_two);
+SearchConditionDate* search_condition_date_construct (GType object_type,
+                                                      SearchConditionSearchType search_type,
+                                                      SearchConditionDateContext context,
+                                                      GDateTime* date_one,
+                                                      GDateTime* date_two);
+static void search_condition_date_set_context (SearchConditionDate* self,
+                                        SearchConditionDateContext value);
+static void search_condition_date_set_date_one (SearchConditionDate* self,
+                                         GDateTime* value);
+static void search_condition_date_set_date_two (SearchConditionDate* self,
+                                         GDateTime* value);
+static gboolean search_condition_date_real_predicate (SearchCondition* base,
+                                               MediaSource* source);
 time_t media_source_get_exposure_time (MediaSource* self);
 SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self);
 GDateTime* search_condition_date_get_date_one (SearchConditionDate* self);
@@ -900,100 +955,160 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self);
 static void search_condition_date_finalize (SearchCondition * obj);
 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 source_holding_tank_ref (gpointer instance);
 void source_holding_tank_unref (gpointer instance);
-GParamSpec* param_spec_source_holding_tank (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_holding_tank (GValue* value, gpointer v_object);
-void value_take_source_holding_tank (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_holding_tank (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags);
+void value_set_source_holding_tank (GValue* value,
+                                    gpointer v_object);
+void value_take_source_holding_tank (GValue* value,
+                                     gpointer v_object);
 gpointer value_get_source_holding_tank (const GValue* value);
 GType source_holding_tank_get_type (void) G_GNUC_CONST;
 gpointer source_snapshot_ref (gpointer instance);
 void source_snapshot_unref (gpointer instance);
-GParamSpec* param_spec_source_snapshot (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_source_snapshot (GValue* value, gpointer v_object);
-void value_take_source_snapshot (GValue* value, gpointer v_object);
+GParamSpec* param_spec_source_snapshot (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_source_snapshot (GValue* value,
+                                gpointer v_object);
+void value_take_source_snapshot (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_source_snapshot (const GValue* value);
 GType source_snapshot_get_type (void) G_GNUC_CONST;
 GType saved_search_get_type (void) G_GNUC_CONST;
 gpointer saved_search_row_ref (gpointer instance);
 void saved_search_row_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_row (GValue* value, gpointer v_object);
-void value_take_saved_search_row (GValue* value, gpointer v_object);
+GParamSpec* param_spec_saved_search_row (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags);
+void value_set_saved_search_row (GValue* value,
+                                 gpointer v_object);
+void value_take_saved_search_row (GValue* value,
+                                  gpointer v_object);
 gpointer value_get_saved_search_row (const GValue* value);
 GType saved_search_row_get_type (void) G_GNUC_CONST;
 #define SAVED_SEARCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH, SavedSearchPrivate))
-enum  {
-	SAVED_SEARCH_DUMMY_PROPERTY
-};
 #define SAVED_SEARCH_TYPENAME "saved_search"
-SavedSearch* saved_search_new (SavedSearchRow* row, gint64 object_id);
-SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gint64 object_id);
-DataSource* data_source_construct (GType object_type, gint64 object_id);
+SavedSearch* saved_search_new (SavedSearchRow* row,
+                               gint64 object_id);
+SavedSearch* saved_search_construct (GType object_type,
+                                     SavedSearchRow* row,
+                                     gint64 object_id);
+DataSource* data_source_construct (GType object_type,
+                                   gint64 object_id);
 static gchar* saved_search_real_get_name (DataObject* base);
 GType saved_search_id_get_type (void) G_GNUC_CONST;
 SavedSearchID* saved_search_id_dup (const SavedSearchID* self);
 void saved_search_id_free (SavedSearchID* self);
 static gchar* saved_search_real_to_string (DataObject* base);
 static gchar* saved_search_real_get_typename (DataSource* base);
-void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result);
+void saved_search_get_saved_search_id (SavedSearch* self,
+                                       SavedSearchID* result);
 static gint64 saved_search_real_get_instance_id (DataSource* base);
-gint saved_search_compare_names (void* a, void* b);
-gint string_collated_compare (void* a, void* b);
-gboolean saved_search_predicate (SavedSearch* self, MediaSource* source);
+gint saved_search_compare_names (void* a,
+                                 void* b);
+gint string_collated_compare (void* a,
+                              void* b);
+gboolean saved_search_predicate (SavedSearch* self,
+                                 MediaSource* source);
 void saved_search_reconstitute (SavedSearch* self);
 gpointer database_table_ref (gpointer instance);
 void database_table_unref (gpointer instance);
-GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_database_table (GValue* value, gpointer v_object);
-void value_take_database_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_database_table (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_database_table (GValue* value,
+                               gpointer v_object);
+void value_take_database_table (GValue* value,
+                                gpointer v_object);
 gpointer value_get_database_table (const GValue* value);
 GType database_table_get_type (void) G_GNUC_CONST;
 GType saved_search_db_table_get_type (void) G_GNUC_CONST;
 SavedSearchDBTable* saved_search_db_table_get_instance (void);
 GQuark database_error_quark (void);
-void saved_search_db_table_create_from_row (SavedSearchDBTable* self, SavedSearchRow* row, SavedSearchID* result, GError** error);
+void saved_search_db_table_create_from_row (SavedSearchDBTable* self,
+                                            SavedSearchRow* row,
+                                            SavedSearchID* result,
+                                            GError** error);
 void app_window_database_error (GError* err);
 gpointer saved_search_table_ref (gpointer instance);
 void saved_search_table_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_table (GValue* value, gpointer v_object);
-void value_take_saved_search_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_saved_search_table (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_saved_search_table (GValue* value,
+                                   gpointer v_object);
+void value_take_saved_search_table (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_saved_search_table (const GValue* value);
 GType saved_search_table_get_type (void) G_GNUC_CONST;
 SavedSearchTable* saved_search_table_get_instance (void);
-void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search);
+void saved_search_table_add_to_map (SavedSearchTable* self,
+                                    SavedSearch* search);
 gchar* data_object_to_string (DataObject* self);
-gboolean saved_search_rename (SavedSearch* self, const gchar* new_name);
-gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name);
-void saved_search_db_table_rename (SavedSearchDBTable* self, SavedSearchID* search_id, const gchar* new_name, GError** error);
-void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* search);
+gboolean saved_search_rename (SavedSearch* self,
+                              const gchar* new_name);
+gboolean saved_search_table_exists (SavedSearchTable* self,
+                                    const gchar* search_name);
+void saved_search_db_table_rename (SavedSearchDBTable* self,
+                                   SavedSearchID* search_id,
+                                   const gchar* new_name,
+                                   GError** error);
+void saved_search_table_remove_from_map (SavedSearchTable* self,
+                                         SavedSearch* search);
 GType page_window_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_switch_to_saved_search (LibraryWindow* self, SavedSearch* search);
+void library_window_switch_to_saved_search (LibraryWindow* self,
+                                            SavedSearch* search);
 GeeList* saved_search_get_conditions (SavedSearch* self);
 SearchOperator saved_search_get_operator (SavedSearch* self);
 static void saved_search_finalize (GObject * obj);
 #define SAVED_SEARCH_TABLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SAVED_SEARCH_TABLE, SavedSearchTablePrivate))
-enum  {
-	SAVED_SEARCH_TABLE_DUMMY_PROPERTY
-};
 static SavedSearchTable* saved_search_table_new (void);
 static SavedSearchTable* saved_search_table_construct (GType object_type);
-GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self, GError** error);
+GeeList* saved_search_db_table_get_all_rows (SavedSearchDBTable* self,
+                                             GError** error);
 #define DATA_OBJECT_INVALID_OBJECT_ID ((gint64) -1)
 GeeCollection* saved_search_table_get_all (SavedSearchTable* self);
-SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions);
-SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions, GError** error);
-void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search);
-void saved_search_db_table_remove (SavedSearchDBTable* self, SavedSearchID* search_id, GError** error);
+SavedSearch* saved_search_table_create (SavedSearchTable* self,
+                                        const gchar* name,
+                                        SearchOperator operator,
+                                        GeeArrayList* conditions);
+SavedSearchRow* saved_search_db_table_add (SavedSearchDBTable* self,
+                                           const gchar* name,
+                                           SearchOperator operator,
+                                           GeeArrayList* conditions,
+                                           GError** error);
+void saved_search_table_remove (SavedSearchTable* self,
+                                SavedSearch* search);
+void saved_search_db_table_remove (SavedSearchDBTable* self,
+                                   SavedSearchID* search_id,
+                                   GError** error);
 GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self);
 gint saved_search_table_get_count (SavedSearchTable* self);
 gchar* saved_search_table_generate_unique_name (SavedSearchTable* self);
@@ -1001,13 +1116,15 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self);
 static void saved_search_table_finalize (SavedSearchTable * obj);
 
 
-gchar* search_operator_to_string (SearchOperator self) {
+gchar*
+search_operator_to_string (SearchOperator self)
+{
 	gchar* result = NULL;
 #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_OPERATOR_ANY:
-#line 1011 "SearchBoolean.c"
+#line 1128 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1016,11 +1133,11 @@ gchar* search_operator_to_string (SearchOperator self) {
 			result = _tmp0_;
 #line 16 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1020 "SearchBoolean.c"
+#line 1137 "SearchBoolean.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_OPERATOR_ALL:
-#line 1024 "SearchBoolean.c"
+#line 1141 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1029,11 +1146,11 @@ gchar* search_operator_to_string (SearchOperator self) {
 			result = _tmp1_;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1033 "SearchBoolean.c"
+#line 1150 "SearchBoolean.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_OPERATOR_NONE:
-#line 1037 "SearchBoolean.c"
+#line 1154 "SearchBoolean.c"
 		{
 			gchar* _tmp2_;
 #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1042,68 +1159,60 @@ gchar* search_operator_to_string (SearchOperator self) {
 			result = _tmp2_;
 #line 22 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1046 "SearchBoolean.c"
+#line 1163 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 25 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:25: unrecognized search operator enumeration value");
-#line 1052 "SearchBoolean.c"
+#line 1169 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchOperator search_operator_from_string (const gchar* str) {
+SearchOperator
+search_operator_from_string (const gchar* str)
+{
 	SearchOperator result = 0;
-	const gchar* _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 30 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 30 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "ANY") == 0) {
+	if (g_strcmp0 (str, "ANY") == 0) {
 #line 31 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_OPERATOR_ANY;
 #line 31 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 1071 "SearchBoolean.c"
+#line 1187 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
-#line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
 #line 33 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "ALL") == 0) {
+		if (g_strcmp0 (str, "ALL") == 0) {
 #line 34 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_OPERATOR_ALL;
 #line 34 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1082 "SearchBoolean.c"
+#line 1195 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
 #line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
-#line 36 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (g_strcmp0 (_tmp2_, "NONE") == 0) {
+			if (g_strcmp0 (str, "NONE") == 0) {
 #line 37 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = SEARCH_OPERATOR_NONE;
 #line 37 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 1093 "SearchBoolean.c"
+#line 1203 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_;
-#line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp3_ = str;
 #line 40 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				g_error ("SearchBoolean.vala:40: unrecognized search operator name: %s", _tmp3_);
-#line 1100 "SearchBoolean.c"
+				g_error ("SearchBoolean.vala:40: unrecognized search operator name: %s", str);
+#line 1207 "SearchBoolean.c"
 			}
 		}
 	}
 }
 
 
-GType search_operator_get_type (void) {
+GType
+search_operator_get_type (void)
+{
 	static volatile gsize search_operator_type_id__volatile = 0;
 	if (g_once_init_enter (&search_operator_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_OPERATOR_ANY, "SEARCH_OPERATOR_ANY", "any"}, {SEARCH_OPERATOR_ALL, "SEARCH_OPERATOR_ALL", "all"}, {SEARCH_OPERATOR_NONE, "SEARCH_OPERATOR_NONE", "none"}, {0, NULL, NULL}};
@@ -1115,7 +1224,9 @@ GType search_operator_get_type (void) {
 }
 
 
-SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1) {
+SearchConditionSearchType*
+search_condition_search_type_as_array (int* result_length1)
+{
 	SearchConditionSearchType* result = NULL;
 	SearchConditionSearchType* _tmp0_;
 	SearchConditionSearchType* _tmp1_;
@@ -1152,76 +1263,66 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le
 	if (result_length1) {
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*result_length1 = _tmp1__length1;
-#line 1156 "SearchBoolean.c"
+#line 1267 "SearchBoolean.c"
 	}
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1162 "SearchBoolean.c"
+#line 1273 "SearchBoolean.c"
 }
 
 
-static gint __lambda13_ (void* a, void* b) {
+static gint
+__lambda13_ (void* a,
+             void* b)
+{
 	gint result = 0;
-	void* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	void* _tmp2_;
-	gchar* _tmp3_;
-	gint _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = a;
+	_tmp0_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) a));
 #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) _tmp0_));
+	_tmp1_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) b));
 #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = b;
-#line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp3_ = search_condition_search_type_display_text (*((SearchConditionSearchType*) _tmp2_));
-#line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	result = _tmp4_;
+	result = utf8_cs_compare (_tmp0_, _tmp1_);
 #line 71 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1187 "SearchBoolean.c"
+#line 1292 "SearchBoolean.c"
 }
 
 
-static gint ___lambda13____compar_fn_t (void* key1, void* key2) {
+static gint
+___lambda13____compar_fn_t (void* key1,
+                            void* key2)
+{
 	gint result;
 	result = __lambda13_ (key1, key2);
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1196 "SearchBoolean.c"
+#line 1304 "SearchBoolean.c"
 }
 
 
-void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1) {
-	SearchConditionSearchType* _tmp0_;
-	gint _tmp0__length1;
-	SearchConditionSearchType* _tmp1_;
-	gint _tmp1__length1;
-#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = *array;
+void
+search_condition_search_type_sort_array (SearchConditionSearchType** array,
+                                         int* array_length1)
+{
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0__length1 = *array_length1;
-#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = *array;
-#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1__length1 = *array_length1;
-#line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda13____compar_fn_t);
-#line 1215 "SearchBoolean.c"
+	qsort (*array, (gsize) (*array_length1), (gsize) sizeof (SearchConditionSearchType), ___lambda13____compar_fn_t);
+#line 1314 "SearchBoolean.c"
 }
 
 
-gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
+gchar*
+search_condition_search_type_to_string (SearchConditionSearchType self)
+{
 	gchar* result = NULL;
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
-#line 1225 "SearchBoolean.c"
+#line 1326 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1230,11 +1331,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp0_;
 #line 79 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1234 "SearchBoolean.c"
+#line 1335 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 1238 "SearchBoolean.c"
+#line 1339 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1243,11 +1344,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp1_;
 #line 82 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1247 "SearchBoolean.c"
+#line 1348 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TAG:
-#line 1251 "SearchBoolean.c"
+#line 1352 "SearchBoolean.c"
 		{
 			gchar* _tmp2_;
 #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1256,11 +1357,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp2_;
 #line 85 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1260 "SearchBoolean.c"
+#line 1361 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
-#line 1264 "SearchBoolean.c"
+#line 1365 "SearchBoolean.c"
 		{
 			gchar* _tmp3_;
 #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1269,11 +1370,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp3_;
 #line 88 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1273 "SearchBoolean.c"
+#line 1374 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME:
-#line 1277 "SearchBoolean.c"
+#line 1378 "SearchBoolean.c"
 		{
 			gchar* _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1282,11 +1383,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp4_;
 #line 91 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1286 "SearchBoolean.c"
+#line 1387 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME:
-#line 1290 "SearchBoolean.c"
+#line 1391 "SearchBoolean.c"
 		{
 			gchar* _tmp5_;
 #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1295,11 +1396,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp5_;
 #line 94 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1299 "SearchBoolean.c"
+#line 1400 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 1303 "SearchBoolean.c"
+#line 1404 "SearchBoolean.c"
 		{
 			gchar* _tmp6_;
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1308,11 +1409,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp6_;
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1312 "SearchBoolean.c"
+#line 1413 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 1316 "SearchBoolean.c"
+#line 1417 "SearchBoolean.c"
 		{
 			gchar* _tmp7_;
 #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1321,11 +1422,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp7_;
 #line 100 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1325 "SearchBoolean.c"
+#line 1426 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 1329 "SearchBoolean.c"
+#line 1430 "SearchBoolean.c"
 		{
 			gchar* _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1334,11 +1435,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1338 "SearchBoolean.c"
+#line 1439 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 1342 "SearchBoolean.c"
+#line 1443 "SearchBoolean.c"
 		{
 			gchar* _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1347,11 +1448,11 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1351 "SearchBoolean.c"
+#line 1452 "SearchBoolean.c"
 		}
 #line 77 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 1355 "SearchBoolean.c"
+#line 1456 "SearchBoolean.c"
 		{
 			gchar* _tmp10_;
 #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1360,149 +1461,115 @@ gchar* search_condition_search_type_to_string (SearchConditionSearchType self) {
 			result = _tmp10_;
 #line 109 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1364 "SearchBoolean.c"
+#line 1465 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 112 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:112: unrecognized search type enumeration value");
-#line 1370 "SearchBoolean.c"
+#line 1471 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionSearchType search_condition_search_type_from_string (const gchar* str) {
+SearchConditionSearchType
+search_condition_search_type_from_string (const gchar* str)
+{
 	SearchConditionSearchType result = 0;
-	const gchar* _tmp0_;
 #line 116 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 117 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 117 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "ANY_TEXT") == 0) {
+	if (g_strcmp0 (str, "ANY_TEXT") == 0) {
 #line 118 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT;
 #line 118 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 1389 "SearchBoolean.c"
+#line 1489 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
 #line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
-#line 120 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "TITLE") == 0) {
+		if (g_strcmp0 (str, "TITLE") == 0) {
 #line 121 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_SEARCH_TYPE_TITLE;
 #line 121 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1400 "SearchBoolean.c"
+#line 1497 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
-#line 123 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (g_strcmp0 (_tmp2_, "TAG") == 0) {
+			if (g_strcmp0 (str, "TAG") == 0) {
 #line 124 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = SEARCH_CONDITION_SEARCH_TYPE_TAG;
 #line 124 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 1411 "SearchBoolean.c"
+#line 1505 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_;
-#line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp3_ = str;
 #line 126 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				if (g_strcmp0 (_tmp3_, "COMMENT") == 0) {
+				if (g_strcmp0 (str, "COMMENT") == 0) {
 #line 127 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					result = SEARCH_CONDITION_SEARCH_TYPE_COMMENT;
 #line 127 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 1422 "SearchBoolean.c"
+#line 1513 "SearchBoolean.c"
 				} else {
-					const gchar* _tmp4_;
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp4_ = str;
-#line 129 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					if (g_strcmp0 (_tmp4_, "EVENT_NAME") == 0) {
+					if (g_strcmp0 (str, "EVENT_NAME") == 0) {
 #line 130 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						result = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME;
 #line 130 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						return result;
-#line 1433 "SearchBoolean.c"
+#line 1521 "SearchBoolean.c"
 					} else {
-						const gchar* _tmp5_;
-#line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						_tmp5_ = str;
 #line 132 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						if (g_strcmp0 (_tmp5_, "FILE_NAME") == 0) {
+						if (g_strcmp0 (str, "FILE_NAME") == 0) {
 #line 133 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							result = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME;
 #line 133 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							return result;
-#line 1444 "SearchBoolean.c"
+#line 1529 "SearchBoolean.c"
 						} else {
-							const gchar* _tmp6_;
-#line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-							_tmp6_ = str;
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-							if (g_strcmp0 (_tmp6_, "MEDIA_TYPE") == 0) {
+							if (g_strcmp0 (str, "MEDIA_TYPE") == 0) {
 #line 136 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								result = SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE;
 #line 136 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								return result;
-#line 1455 "SearchBoolean.c"
+#line 1537 "SearchBoolean.c"
 							} else {
-								const gchar* _tmp7_;
 #line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-								_tmp7_ = str;
-#line 138 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-								if (g_strcmp0 (_tmp7_, "FLAG_STATE") == 0) {
+								if (g_strcmp0 (str, "FLAG_STATE") == 0) {
 #line 139 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 									result = SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE;
 #line 139 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 									return result;
-#line 1466 "SearchBoolean.c"
+#line 1545 "SearchBoolean.c"
 								} else {
-									const gchar* _tmp8_;
-#line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-									_tmp8_ = str;
 #line 141 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-									if (g_strcmp0 (_tmp8_, "MODIFIED_STATE") == 0) {
+									if (g_strcmp0 (str, "MODIFIED_STATE") == 0) {
 #line 142 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 										result = SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE;
 #line 142 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 										return result;
-#line 1477 "SearchBoolean.c"
+#line 1553 "SearchBoolean.c"
 									} else {
-										const gchar* _tmp9_;
-#line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-										_tmp9_ = str;
 #line 144 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-										if (g_strcmp0 (_tmp9_, "RATING") == 0) {
+										if (g_strcmp0 (str, "RATING") == 0) {
 #line 145 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 											result = SEARCH_CONDITION_SEARCH_TYPE_RATING;
 #line 145 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 											return result;
-#line 1488 "SearchBoolean.c"
+#line 1561 "SearchBoolean.c"
 										} else {
-											const gchar* _tmp10_;
 #line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-											_tmp10_ = str;
-#line 147 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-											if (g_strcmp0 (_tmp10_, "DATE") == 0) {
+											if (g_strcmp0 (str, "DATE") == 0) {
 #line 148 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 												result = SEARCH_CONDITION_SEARCH_TYPE_DATE;
 #line 148 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 												return result;
-#line 1499 "SearchBoolean.c"
+#line 1569 "SearchBoolean.c"
 											} else {
-												const gchar* _tmp11_;
-#line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-												_tmp11_ = str;
 #line 151 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-												g_error ("SearchBoolean.vala:151: unrecognized search type name: %s", _tmp11_);
-#line 1506 "SearchBoolean.c"
+												g_error ("SearchBoolean.vala:151: unrecognized search type name: %s", str);
+#line 1573 "SearchBoolean.c"
 											}
 										}
 									}
@@ -1517,13 +1584,15 @@ SearchConditionSearchType search_condition_search_type_from_string (const gchar*
 }
 
 
-gchar* search_condition_search_type_display_text (SearchConditionSearchType self) {
+gchar*
+search_condition_search_type_display_text (SearchConditionSearchType self)
+{
 	gchar* result = NULL;
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
-#line 1527 "SearchBoolean.c"
+#line 1596 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1532,11 +1601,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp0_;
 #line 157 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1536 "SearchBoolean.c"
+#line 1605 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 1540 "SearchBoolean.c"
+#line 1609 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1545,11 +1614,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp1_;
 #line 160 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1549 "SearchBoolean.c"
+#line 1618 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TAG:
-#line 1553 "SearchBoolean.c"
+#line 1622 "SearchBoolean.c"
 		{
 			gchar* _tmp2_;
 #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1558,11 +1627,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp2_;
 #line 163 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1562 "SearchBoolean.c"
+#line 1631 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
-#line 1566 "SearchBoolean.c"
+#line 1635 "SearchBoolean.c"
 		{
 			gchar* _tmp3_;
 #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1571,11 +1640,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp3_;
 #line 166 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1575 "SearchBoolean.c"
+#line 1644 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME:
-#line 1579 "SearchBoolean.c"
+#line 1648 "SearchBoolean.c"
 		{
 			gchar* _tmp4_;
 #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1584,11 +1653,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp4_;
 #line 169 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1588 "SearchBoolean.c"
+#line 1657 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME:
-#line 1592 "SearchBoolean.c"
+#line 1661 "SearchBoolean.c"
 		{
 			gchar* _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1597,11 +1666,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1601 "SearchBoolean.c"
+#line 1670 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 1605 "SearchBoolean.c"
+#line 1674 "SearchBoolean.c"
 		{
 			gchar* _tmp6_;
 #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1610,11 +1679,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp6_;
 #line 175 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1614 "SearchBoolean.c"
+#line 1683 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 1618 "SearchBoolean.c"
+#line 1687 "SearchBoolean.c"
 		{
 			gchar* _tmp7_;
 #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1623,11 +1692,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp7_;
 #line 178 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1627 "SearchBoolean.c"
+#line 1696 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 1631 "SearchBoolean.c"
+#line 1700 "SearchBoolean.c"
 		{
 			gchar* _tmp8_;
 #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1636,11 +1705,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp8_;
 #line 181 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1640 "SearchBoolean.c"
+#line 1709 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 1644 "SearchBoolean.c"
+#line 1713 "SearchBoolean.c"
 		{
 			gchar* _tmp9_;
 #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1649,11 +1718,11 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp9_;
 #line 184 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1653 "SearchBoolean.c"
+#line 1722 "SearchBoolean.c"
 		}
 #line 155 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 1657 "SearchBoolean.c"
+#line 1726 "SearchBoolean.c"
 		{
 			gchar* _tmp10_;
 #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1662,19 +1731,21 @@ gchar* search_condition_search_type_display_text (SearchConditionSearchType self
 			result = _tmp10_;
 #line 187 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 1666 "SearchBoolean.c"
+#line 1735 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 190 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:190: unrecognized search type enumeration value");
-#line 1672 "SearchBoolean.c"
+#line 1741 "SearchBoolean.c"
 		}
 	}
 }
 
 
-GType search_condition_search_type_get_type (void) {
+GType
+search_condition_search_type_get_type (void)
+{
 	static volatile gsize search_condition_search_type_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_search_type_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT, "SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT", "any-text"}, {SEARCH_CONDITION_SEARCH_TYPE_TITLE, "SEARCH_CONDITION_SEARCH_TYPE_TITLE", "title"}, {SEARCH_CONDITION_SEARCH_TYPE_TAG, "SEARCH_CONDITION_SEARCH_TYPE_TAG", "tag"}, {SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME, "SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME", "event-name"}, {SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME, "SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME", "file-name"}, {SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE, "SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE", "media-type"}, {SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE, "SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE", "flag-state"}, {SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE, "SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE", "modified-state"}, {SEARCH_CONDITION_SEARCH_TYPE_RATING, "SEARCH_CONDITION_SEARCH_TYPE_RATING", "rating"}, {SEARCH_CONDITION_SEARCH_TYPE_COMMENT, "SEARCH_CONDITION_SEARCH_TYPE_COMMENT", "comment"}, {SEARCH_CONDITION_SEARCH_TYPE_DATE, "SEARCH_CONDITION_SEARCH_TYPE_DATE", "date"}, {0, NULL, NULL}};
@@ -1686,36 +1757,46 @@ GType search_condition_search_type_get_type (void) {
 }
 
 
-static gboolean search_condition_real_predicate (SearchCondition* self, MediaSource* source) {
+static gboolean
+search_condition_real_predicate (SearchCondition* self,
+                                 MediaSource* source)
+{
 	gboolean _tmp0_ = FALSE;
 #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_critical ("Type `%s' does not implement abstract method `search_condition_predicate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return _tmp0_;
-#line 1696 "SearchBoolean.c"
+#line 1770 "SearchBoolean.c"
 }
 
 
-gboolean search_condition_predicate (SearchCondition* self, MediaSource* source) {
+gboolean
+search_condition_predicate (SearchCondition* self,
+                            MediaSource* source)
+{
 #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION (self), FALSE);
 #line 198 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return SEARCH_CONDITION_GET_CLASS (self)->predicate (self, source);
-#line 1705 "SearchBoolean.c"
+#line 1782 "SearchBoolean.c"
 }
 
 
-SearchCondition* search_condition_construct (GType object_type) {
+SearchCondition*
+search_condition_construct (GType object_type)
+{
 	SearchCondition* self = NULL;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchCondition*) g_type_create_instance (object_type);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 1715 "SearchBoolean.c"
+#line 1794 "SearchBoolean.c"
 }
 
 
-SearchConditionSearchType search_condition_get_search_type (SearchCondition* self) {
+SearchConditionSearchType
+search_condition_get_search_type (SearchCondition* self)
+{
 	SearchConditionSearchType result;
 	SearchConditionSearchType _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1726,120 +1807,145 @@ SearchConditionSearchType search_condition_get_search_type (SearchCondition* sel
 	result = _tmp0_;
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 1730 "SearchBoolean.c"
+#line 1811 "SearchBoolean.c"
 }
 
 
-void search_condition_set_search_type (SearchCondition* self, SearchConditionSearchType value) {
-	SearchConditionSearchType _tmp0_;
+void
+search_condition_set_search_type (SearchCondition* self,
+                                  SearchConditionSearchType value)
+{
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (self));
 #line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 195 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_search_type = _tmp0_;
-#line 1742 "SearchBoolean.c"
+	self->priv->_search_type = value;
+#line 1823 "SearchBoolean.c"
 }
 
 
-static void value_search_condition_init (GValue* value) {
+static void
+value_search_condition_init (GValue* value)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	value->data[0].v_pointer = NULL;
-#line 1749 "SearchBoolean.c"
+#line 1832 "SearchBoolean.c"
 }
 
 
-static void value_search_condition_free_value (GValue* value) {
+static void
+value_search_condition_free_value (GValue* value)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (value->data[0].v_pointer) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_unref (value->data[0].v_pointer);
-#line 1758 "SearchBoolean.c"
+#line 1843 "SearchBoolean.c"
 	}
 }
 
 
-static void value_search_condition_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_search_condition_copy_value (const GValue* src_value,
+                                   GValue* dest_value)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (src_value->data[0].v_pointer) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = search_condition_ref (src_value->data[0].v_pointer);
-#line 1768 "SearchBoolean.c"
+#line 1856 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1772 "SearchBoolean.c"
+#line 1860 "SearchBoolean.c"
 	}
 }
 
 
-static gpointer value_search_condition_peek_pointer (const GValue* value) {
+static gpointer
+value_search_condition_peek_pointer (const GValue* value)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 1780 "SearchBoolean.c"
+#line 1870 "SearchBoolean.c"
 }
 
 
-static gchar* value_search_condition_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_search_condition_collect_value (GValue* value,
+                                      guint n_collect_values,
+                                      GTypeCValue* collect_values,
+                                      guint collect_flags)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (collect_values[0].v_pointer) {
-#line 1787 "SearchBoolean.c"
+#line 1882 "SearchBoolean.c"
 		SearchCondition * object;
 		object = collect_values[0].v_pointer;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1794 "SearchBoolean.c"
+#line 1889 "SearchBoolean.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1798 "SearchBoolean.c"
+#line 1893 "SearchBoolean.c"
 		}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = search_condition_ref (object);
-#line 1802 "SearchBoolean.c"
+#line 1897 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1806 "SearchBoolean.c"
+#line 1901 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 1810 "SearchBoolean.c"
+#line 1905 "SearchBoolean.c"
 }
 
 
-static gchar* value_search_condition_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_search_condition_lcopy_value (const GValue* value,
+                                    guint n_collect_values,
+                                    GTypeCValue* collect_values,
+                                    guint collect_flags)
+{
 	SearchCondition ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!object_p) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1821 "SearchBoolean.c"
+#line 1921 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!value->data[0].v_pointer) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = NULL;
-#line 1827 "SearchBoolean.c"
+#line 1927 "SearchBoolean.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1831 "SearchBoolean.c"
+#line 1931 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = search_condition_ref (value->data[0].v_pointer);
-#line 1835 "SearchBoolean.c"
+#line 1935 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 1839 "SearchBoolean.c"
+#line 1939 "SearchBoolean.c"
 }
 
 
-GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_search_condition (const gchar* name,
+                             const gchar* nick,
+                             const gchar* blurb,
+                             GType object_type,
+                             GParamFlags flags)
+{
 	ParamSpecSearchCondition* spec;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SEARCH_CONDITION), NULL);
@@ -1849,20 +1955,25 @@ GParamSpec* param_spec_search_condition (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return G_PARAM_SPEC (spec);
-#line 1853 "SearchBoolean.c"
+#line 1959 "SearchBoolean.c"
 }
 
 
-gpointer value_get_search_condition (const GValue* value) {
+gpointer
+value_get_search_condition (const GValue* value)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION), NULL);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 1862 "SearchBoolean.c"
+#line 1970 "SearchBoolean.c"
 }
 
 
-void value_set_search_condition (GValue* value, gpointer v_object) {
+void
+value_set_search_condition (GValue* value,
+                            gpointer v_object)
+{
 	SearchCondition * old;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION));
@@ -1878,22 +1989,25 @@ void value_set_search_condition (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_ref (value->data[0].v_pointer);
-#line 1882 "SearchBoolean.c"
+#line 1993 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1886 "SearchBoolean.c"
+#line 1997 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_unref (old);
-#line 1892 "SearchBoolean.c"
+#line 2003 "SearchBoolean.c"
 	}
 }
 
 
-void value_take_search_condition (GValue* value, gpointer v_object) {
+void
+value_take_search_condition (GValue* value,
+                             gpointer v_object)
+{
 	SearchCondition * old;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_CONDITION));
@@ -1907,22 +2021,24 @@ void value_take_search_condition (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = v_object;
-#line 1911 "SearchBoolean.c"
+#line 2025 "SearchBoolean.c"
 	} else {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 1915 "SearchBoolean.c"
+#line 2029 "SearchBoolean.c"
 	}
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		search_condition_unref (old);
-#line 1921 "SearchBoolean.c"
+#line 2035 "SearchBoolean.c"
 	}
 }
 
 
-static void search_condition_class_init (SearchConditionClass * klass) {
+static void
+search_condition_class_init (SearchConditionClass * klass)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_parent_class = g_type_class_peek_parent (klass);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1931,30 +2047,36 @@ static void search_condition_class_init (SearchConditionClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchConditionPrivate));
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_real_predicate;
-#line 1935 "SearchBoolean.c"
+#line 2051 "SearchBoolean.c"
 }
 
 
-static void search_condition_instance_init (SearchCondition * self) {
+static void
+search_condition_instance_init (SearchCondition * self)
+{
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_GET_PRIVATE (self);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->ref_count = 1;
-#line 1944 "SearchBoolean.c"
+#line 2062 "SearchBoolean.c"
 }
 
 
-static void search_condition_finalize (SearchCondition * obj) {
+static void
+search_condition_finalize (SearchCondition * obj)
+{
 	SearchCondition * self;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION, SearchCondition);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_signal_handlers_destroy (self);
-#line 1954 "SearchBoolean.c"
+#line 2074 "SearchBoolean.c"
 }
 
 
-GType search_condition_get_type (void) {
+GType
+search_condition_get_type (void)
+{
 	static volatile gsize search_condition_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_search_condition_init, value_search_condition_free_value, value_search_condition_copy_value, value_search_condition_peek_pointer, "p", value_search_condition_collect_value, "p", value_search_condition_lcopy_value };
@@ -1968,18 +2090,22 @@ GType search_condition_get_type (void) {
 }
 
 
-gpointer search_condition_ref (gpointer instance) {
+gpointer
+search_condition_ref (gpointer instance)
+{
 	SearchCondition * self;
 	self = instance;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return instance;
-#line 1979 "SearchBoolean.c"
+#line 2103 "SearchBoolean.c"
 }
 
 
-void search_condition_unref (gpointer instance) {
+void
+search_condition_unref (gpointer instance)
+{
 	SearchCondition * self;
 	self = instance;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -1988,18 +2114,20 @@ void search_condition_unref (gpointer instance) {
 		SEARCH_CONDITION_GET_CLASS (self)->finalize (self);
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1992 "SearchBoolean.c"
+#line 2118 "SearchBoolean.c"
 	}
 }
 
 
-gchar* search_condition_text_context_to_string (SearchConditionTextContext self) {
+gchar*
+search_condition_text_context_to_string (SearchConditionTextContext self)
+{
 	gchar* result = NULL;
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS:
-#line 2003 "SearchBoolean.c"
+#line 2131 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2008,11 +2136,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp0_;
 #line 215 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2012 "SearchBoolean.c"
+#line 2140 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY:
-#line 2016 "SearchBoolean.c"
+#line 2144 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2021,11 +2149,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp1_;
 #line 218 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2025 "SearchBoolean.c"
+#line 2153 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH:
-#line 2029 "SearchBoolean.c"
+#line 2157 "SearchBoolean.c"
 		{
 			gchar* _tmp2_;
 #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2034,11 +2162,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp2_;
 #line 221 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2038 "SearchBoolean.c"
+#line 2166 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH:
-#line 2042 "SearchBoolean.c"
+#line 2170 "SearchBoolean.c"
 		{
 			gchar* _tmp3_;
 #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2047,11 +2175,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp3_;
 #line 224 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2051 "SearchBoolean.c"
+#line 2179 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN:
-#line 2055 "SearchBoolean.c"
+#line 2183 "SearchBoolean.c"
 		{
 			gchar* _tmp4_;
 #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2060,11 +2188,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp4_;
 #line 227 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2064 "SearchBoolean.c"
+#line 2192 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET:
-#line 2068 "SearchBoolean.c"
+#line 2196 "SearchBoolean.c"
 		{
 			gchar* _tmp5_;
 #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2073,11 +2201,11 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp5_;
 #line 230 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2077 "SearchBoolean.c"
+#line 2205 "SearchBoolean.c"
 		}
 #line 213 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET:
-#line 2081 "SearchBoolean.c"
+#line 2209 "SearchBoolean.c"
 		{
 			gchar* _tmp6_;
 #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2086,106 +2214,84 @@ gchar* search_condition_text_context_to_string (SearchConditionTextContext self)
 			result = _tmp6_;
 #line 233 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2090 "SearchBoolean.c"
+#line 2218 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 236 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:236: unrecognized text search context enumeration v" \
 "alue");
-#line 2096 "SearchBoolean.c"
+#line 2224 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionTextContext search_condition_text_context_from_string (const gchar* str) {
+SearchConditionTextContext
+search_condition_text_context_from_string (const gchar* str)
+{
 	SearchConditionTextContext result = 0;
-	const gchar* _tmp0_;
 #line 240 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 241 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 241 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "CONTAINS") == 0) {
+	if (g_strcmp0 (str, "CONTAINS") == 0) {
 #line 242 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS;
 #line 242 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 2115 "SearchBoolean.c"
+#line 2242 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
 #line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
-#line 244 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "IS_EXACTLY") == 0) {
+		if (g_strcmp0 (str, "IS_EXACTLY") == 0) {
 #line 245 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY;
 #line 245 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2126 "SearchBoolean.c"
+#line 2250 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
-#line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
 #line 247 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (g_strcmp0 (_tmp2_, "STARTS_WITH") == 0) {
+			if (g_strcmp0 (str, "STARTS_WITH") == 0) {
 #line 248 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH;
 #line 248 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 2137 "SearchBoolean.c"
+#line 2258 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_;
 #line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp3_ = str;
-#line 250 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				if (g_strcmp0 (_tmp3_, "ENDS_WITH") == 0) {
+				if (g_strcmp0 (str, "ENDS_WITH") == 0) {
 #line 251 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					result = SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH;
 #line 251 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 2148 "SearchBoolean.c"
+#line 2266 "SearchBoolean.c"
 				} else {
-					const gchar* _tmp4_;
-#line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp4_ = str;
 #line 253 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					if (g_strcmp0 (_tmp4_, "DOES_NOT_CONTAIN") == 0) {
+					if (g_strcmp0 (str, "DOES_NOT_CONTAIN") == 0) {
 #line 254 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						result = SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN;
 #line 254 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						return result;
-#line 2159 "SearchBoolean.c"
+#line 2274 "SearchBoolean.c"
 					} else {
-						const gchar* _tmp5_;
-#line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						_tmp5_ = str;
 #line 256 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						if (g_strcmp0 (_tmp5_, "IS_NOT_SET") == 0) {
+						if (g_strcmp0 (str, "IS_NOT_SET") == 0) {
 #line 257 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							result = SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
 #line 257 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 							return result;
-#line 2170 "SearchBoolean.c"
+#line 2282 "SearchBoolean.c"
 						} else {
-							const gchar* _tmp6_;
-#line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-							_tmp6_ = str;
 #line 259 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-							if (g_strcmp0 (_tmp6_, "IS_SET") == 0) {
+							if (g_strcmp0 (str, "IS_SET") == 0) {
 #line 260 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								result = SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
 #line 260 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 								return result;
-#line 2181 "SearchBoolean.c"
+#line 2290 "SearchBoolean.c"
 							} else {
-								const gchar* _tmp7_;
 #line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-								_tmp7_ = str;
-#line 263 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-								g_error ("SearchBoolean.vala:263: unrecognized text search context name: %s", _tmp7_);
-#line 2188 "SearchBoolean.c"
+								g_error ("SearchBoolean.vala:263: unrecognized text search context name: %s", str);
+#line 2294 "SearchBoolean.c"
 							}
 						}
 					}
@@ -2196,7 +2302,9 @@ SearchConditionTextContext search_condition_text_context_from_string (const gcha
 }
 
 
-GType search_condition_text_context_get_type (void) {
+GType
+search_condition_text_context_get_type (void)
+{
 	static volatile gsize search_condition_text_context_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_text_context_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS, "SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS", "contains"}, {SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY, "SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY", "is-exactly"}, {SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH, "SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH", "starts-with"}, {SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH, "SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH", "ends-with"}, {SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN, "SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN", "does-not-contain"}, {SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET, "SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET", "is-not-set"}, {SEARCH_CONDITION_TEXT_CONTEXT_IS_SET, "SEARCH_CONDITION_TEXT_CONTEXT_IS_SET", "is-set"}, {0, NULL, NULL}};
@@ -2208,94 +2316,95 @@ GType search_condition_text_context_get_type (void) {
 }
 
 
-SearchConditionText* search_condition_text_construct (GType object_type, SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) {
+SearchConditionText*
+search_condition_text_construct (GType object_type,
+                                 SearchConditionSearchType search_type,
+                                 const gchar* text,
+                                 SearchConditionTextContext context)
+{
 	SearchConditionText* self = NULL;
-	SearchConditionSearchType _tmp0_;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_;
-	SearchConditionTextContext _tmp8_;
+	gchar* _tmp0_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionText*) search_condition_construct (object_type);
 #line 274 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = search_type;
-#line 274 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_);
-#line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = text;
+	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type);
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp2_ != NULL) {
-#line 2227 "SearchBoolean.c"
-		const gchar* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-		gchar* _tmp6_;
+	if (text != NULL) {
+#line 2333 "SearchBoolean.c"
+		gchar* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp3_ = text;
+		_tmp1_ = g_utf8_strdown (text, (gssize) -1);
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp4_ = g_utf8_strdown (_tmp3_, (gssize) -1);
-#line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp5_ = _tmp4_;
+		_tmp2_ = _tmp1_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp6_ = string_remove_diacritics (_tmp5_);
+		_tmp3_ = string_remove_diacritics (_tmp2_);
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp1_);
+		_g_free0 (_tmp0_);
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = _tmp6_;
+		_tmp0_ = _tmp3_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp5_);
-#line 2246 "SearchBoolean.c"
+		_g_free0 (_tmp2_);
+#line 2349 "SearchBoolean.c"
 	} else {
-		gchar* _tmp7_;
+		gchar* _tmp4_;
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp7_ = g_strdup ("");
+		_tmp4_ = g_strdup ("");
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp1_);
+		_g_free0 (_tmp0_);
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = _tmp7_;
-#line 2255 "SearchBoolean.c"
+		_tmp0_ = _tmp4_;
+#line 2358 "SearchBoolean.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_text_set_text (self, _tmp1_);
+	search_condition_text_set_text (self, _tmp0_);
 #line 276 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp8_ = context;
-#line 276 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_text_set_context (self, _tmp8_);
+	search_condition_text_set_context (self, context);
 #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_free0 (_tmp1_);
+	_g_free0 (_tmp0_);
 #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 2267 "SearchBoolean.c"
+#line 2368 "SearchBoolean.c"
 }
 
 
-SearchConditionText* search_condition_text_new (SearchConditionSearchType search_type, const gchar* text, SearchConditionTextContext context) {
+SearchConditionText*
+search_condition_text_new (SearchConditionSearchType search_type,
+                           const gchar* text,
+                           SearchConditionTextContext context)
+{
 #line 273 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_text_construct (TYPE_SEARCH_CONDITION_TEXT, search_type, text, context);
-#line 2274 "SearchBoolean.c"
+#line 2379 "SearchBoolean.c"
 }
 
 
-static gboolean string_contains (const gchar* self, const gchar* needle) {
+static gboolean
+string_contains (const gchar* self,
+                 const gchar* needle)
+{
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = strstr ((gchar*) self, (gchar*) needle);
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_ != NULL;
+#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 2294 "SearchBoolean.c"
+#line 2399 "SearchBoolean.c"
 }
 
 
-static gboolean search_condition_text_string_match (SearchConditionText* self, const gchar* needle, const gchar* haystack) {
+static gboolean
+search_condition_text_string_match (SearchConditionText* self,
+                                    const gchar* needle,
+                                    const gchar* haystack)
+{
 	gboolean result = FALSE;
 	SearchConditionTextContext _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2310,222 +2419,154 @@ static gboolean search_condition_text_string_match (SearchConditionText* self, c
 		case SEARCH_CONDITION_TEXT_CONTEXT_CONTAINS:
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN:
-#line 2313 "SearchBoolean.c"
+#line 2422 "SearchBoolean.c"
 		{
 			gboolean _tmp1_ = FALSE;
-			const gchar* _tmp2_;
-			gboolean _tmp3_;
-#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = haystack;
-#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp3_ = is_string_empty (_tmp2_);
-#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (!_tmp3_) {
-#line 2324 "SearchBoolean.c"
-				const gchar* _tmp4_;
-				const gchar* _tmp5_;
-				gboolean _tmp6_;
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp4_ = haystack;
+			if (!is_string_empty (haystack)) {
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp5_ = needle;
-#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp6_ = string_contains (_tmp4_, _tmp5_);
-#line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp1_ = _tmp6_;
-#line 2336 "SearchBoolean.c"
+				_tmp1_ = string_contains (haystack, needle);
+#line 2429 "SearchBoolean.c"
 			} else {
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp1_ = FALSE;
-#line 2340 "SearchBoolean.c"
+#line 2433 "SearchBoolean.c"
 			}
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = _tmp1_;
 #line 284 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2346 "SearchBoolean.c"
+#line 2439 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_EXACTLY:
-#line 2350 "SearchBoolean.c"
+#line 2443 "SearchBoolean.c"
 		{
-			gboolean _tmp7_ = FALSE;
-			const gchar* _tmp8_;
-			gboolean _tmp9_;
-#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp8_ = haystack;
-#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp9_ = is_string_empty (_tmp8_);
-#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (!_tmp9_) {
-#line 2361 "SearchBoolean.c"
-				const gchar* _tmp10_;
-				const gchar* _tmp11_;
-#line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp10_ = haystack;
+			gboolean _tmp2_ = FALSE;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp11_ = needle;
+			if (!is_string_empty (haystack)) {
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp7_ = g_strcmp0 (_tmp10_, _tmp11_) == 0;
-#line 2370 "SearchBoolean.c"
+				_tmp2_ = g_strcmp0 (haystack, needle) == 0;
+#line 2450 "SearchBoolean.c"
 			} else {
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp7_ = FALSE;
-#line 2374 "SearchBoolean.c"
+				_tmp2_ = FALSE;
+#line 2454 "SearchBoolean.c"
 			}
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp7_;
+			result = _tmp2_;
 #line 287 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2380 "SearchBoolean.c"
+#line 2460 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_STARTS_WITH:
-#line 2384 "SearchBoolean.c"
+#line 2464 "SearchBoolean.c"
 		{
-			gboolean _tmp12_ = FALSE;
-			const gchar* _tmp13_;
-			gboolean _tmp14_;
-#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp13_ = haystack;
-#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp14_ = is_string_empty (_tmp13_);
-#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (!_tmp14_) {
-#line 2395 "SearchBoolean.c"
-				const gchar* _tmp15_;
-				const gchar* _tmp16_;
-				gboolean _tmp17_;
-#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp15_ = haystack;
+			gboolean _tmp3_ = FALSE;
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp16_ = needle;
+			if (!is_string_empty (haystack)) {
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp17_ = g_str_has_prefix (_tmp15_, _tmp16_);
-#line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp12_ = _tmp17_;
-#line 2407 "SearchBoolean.c"
+				_tmp3_ = g_str_has_prefix (haystack, needle);
+#line 2471 "SearchBoolean.c"
 			} else {
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp12_ = FALSE;
-#line 2411 "SearchBoolean.c"
+				_tmp3_ = FALSE;
+#line 2475 "SearchBoolean.c"
 			}
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp12_;
+			result = _tmp3_;
 #line 290 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2417 "SearchBoolean.c"
+#line 2481 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_ENDS_WITH:
-#line 2421 "SearchBoolean.c"
+#line 2485 "SearchBoolean.c"
 		{
-			gboolean _tmp18_ = FALSE;
-			const gchar* _tmp19_;
-			gboolean _tmp20_;
-#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp19_ = haystack;
-#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp20_ = is_string_empty (_tmp19_);
-#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (!_tmp20_) {
-#line 2432 "SearchBoolean.c"
-				const gchar* _tmp21_;
-				const gchar* _tmp22_;
-				gboolean _tmp23_;
-#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp21_ = haystack;
-#line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp22_ = needle;
+			gboolean _tmp4_ = FALSE;
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp23_ = g_str_has_suffix (_tmp21_, _tmp22_);
+			if (!is_string_empty (haystack)) {
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp18_ = _tmp23_;
-#line 2444 "SearchBoolean.c"
+				_tmp4_ = g_str_has_suffix (haystack, needle);
+#line 2492 "SearchBoolean.c"
 			} else {
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp18_ = FALSE;
-#line 2448 "SearchBoolean.c"
+				_tmp4_ = FALSE;
+#line 2496 "SearchBoolean.c"
 			}
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp18_;
+			result = _tmp4_;
 #line 293 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2454 "SearchBoolean.c"
+#line 2502 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET:
-#line 2458 "SearchBoolean.c"
+#line 2506 "SearchBoolean.c"
 		{
-			const gchar* _tmp24_;
-			gboolean _tmp25_;
-#line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp24_ = haystack;
 #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp25_ = is_string_empty (_tmp24_);
-#line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp25_;
+			result = is_string_empty (haystack);
 #line 296 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2470 "SearchBoolean.c"
+#line 2512 "SearchBoolean.c"
 		}
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_TEXT_CONTEXT_IS_SET:
-#line 2474 "SearchBoolean.c"
+#line 2516 "SearchBoolean.c"
 		{
-			const gchar* _tmp26_;
-			gboolean _tmp27_;
-#line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp26_ = haystack;
 #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp27_ = is_string_empty (_tmp26_);
-#line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = !_tmp27_;
+			result = !is_string_empty (haystack);
 #line 299 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 2486 "SearchBoolean.c"
+#line 2522 "SearchBoolean.c"
 		}
 		default:
 #line 281 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		break;
-#line 2491 "SearchBoolean.c"
+#line 2527 "SearchBoolean.c"
 	}
 #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = FALSE;
 #line 302 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 2497 "SearchBoolean.c"
+#line 2533 "SearchBoolean.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2504 "SearchBoolean.c"
+#line 2542 "SearchBoolean.c"
 }
 
 
-static gboolean search_condition_text_real_predicate (SearchCondition* base, MediaSource* source) {
+static gboolean
+search_condition_text_real_predicate (SearchCondition* base,
+                                      MediaSource* source)
+{
 	SearchConditionText * self;
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	gboolean _tmp0_ = FALSE;
 	SearchConditionSearchType _tmp1_;
 	SearchConditionSearchType _tmp2_;
-	gboolean _tmp21_ = FALSE;
-	SearchConditionSearchType _tmp22_;
-	SearchConditionSearchType _tmp23_;
-	gboolean _tmp52_ = FALSE;
-	SearchConditionSearchType _tmp53_;
-	SearchConditionSearchType _tmp54_;
-	gboolean _tmp75_ = FALSE;
-	SearchConditionSearchType _tmp76_;
-	SearchConditionSearchType _tmp77_;
-	gboolean _tmp91_ = FALSE;
-	SearchConditionSearchType _tmp92_;
-	SearchConditionSearchType _tmp93_;
-	gboolean _tmp106_ = FALSE;
-	SearchConditionTextContext _tmp107_;
+	gboolean _tmp18_ = FALSE;
+	SearchConditionSearchType _tmp19_;
+	SearchConditionSearchType _tmp20_;
+	gboolean _tmp46_ = FALSE;
+	SearchConditionSearchType _tmp47_;
+	SearchConditionSearchType _tmp48_;
+	gboolean _tmp66_ = FALSE;
+	SearchConditionSearchType _tmp67_;
+	SearchConditionSearchType _tmp68_;
+	gboolean _tmp80_ = FALSE;
+	SearchConditionSearchType _tmp81_;
+	SearchConditionSearchType _tmp82_;
+	gboolean _tmp93_ = FALSE;
+	SearchConditionTextContext _tmp94_;
 #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText);
 #line 306 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -2540,7 +2581,7 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp2_) {
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = TRUE;
-#line 2543 "SearchBoolean.c"
+#line 2584 "SearchBoolean.c"
 	} else {
 		SearchConditionSearchType _tmp3_;
 		SearchConditionSearchType _tmp4_;
@@ -2550,523 +2591,486 @@ static gboolean search_condition_text_real_predicate (SearchCondition* base, Med
 		_tmp4_ = _tmp3_;
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = SEARCH_CONDITION_SEARCH_TYPE_TITLE == _tmp4_;
-#line 2553 "SearchBoolean.c"
+#line 2594 "SearchBoolean.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_) {
-#line 2557 "SearchBoolean.c"
+#line 2598 "SearchBoolean.c"
 		gchar* _tmp5_ = NULL;
-		MediaSource* _tmp6_;
+		gchar* _tmp6_;
 		gchar* _tmp7_;
-		gchar* _tmp8_;
-		gboolean _tmp9_;
+		gboolean _tmp8_;
 		gchar* title = NULL;
-		gchar* _tmp16_;
-		gboolean _tmp17_;
-		const gchar* _tmp18_;
-		const gchar* _tmp19_;
-		gboolean _tmp20_;
+		gchar* _tmp14_;
+		gboolean _tmp15_;
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp6_ = source;
+		_tmp6_ = media_source_get_title (source);
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp7_ = media_source_get_title (_tmp6_);
-#line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp9_ = NULL != _tmp8_;
+		_tmp8_ = NULL != _tmp7_;
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp8_);
+		_g_free0 (_tmp7_);
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (_tmp9_) {
-#line 2581 "SearchBoolean.c"
-			MediaSource* _tmp10_;
+		if (_tmp8_) {
+#line 2618 "SearchBoolean.c"
+			gchar* _tmp9_;
+			gchar* _tmp10_;
 			gchar* _tmp11_;
 			gchar* _tmp12_;
 			gchar* _tmp13_;
-			gchar* _tmp14_;
-			gchar* _tmp15_;
-#line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp10_ = source;
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp11_ = media_source_get_title (_tmp10_);
+			_tmp9_ = media_source_get_title (source);
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp12_ = _tmp11_;
+			_tmp10_ = _tmp9_;
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp13_ = g_utf8_strdown (_tmp12_, (gssize) -1);
+			_tmp11_ = g_utf8_strdown (_tmp10_, (gssize) -1);
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp14_ = _tmp13_;
+			_tmp12_ = _tmp11_;
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp15_ = string_remove_diacritics (_tmp14_);
+			_tmp13_ = string_remove_diacritics (_tmp12_);
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (_tmp5_);
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp5_ = _tmp15_;
-#line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_free0 (_tmp14_);
+			_tmp5_ = _tmp13_;
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (_tmp12_);
-#line 2608 "SearchBoolean.c"
+#line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
+			_g_free0 (_tmp10_);
+#line 2642 "SearchBoolean.c"
 		} else {
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (_tmp5_);
 #line 312 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp5_ = NULL;
-#line 2614 "SearchBoolean.c"
+#line 2648 "SearchBoolean.c"
 		}
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp16_ = g_strdup (_tmp5_);
+		_tmp14_ = g_strdup (_tmp5_);
 #line 311 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		title = _tmp16_;
-#line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp17_ = ret;
+		title = _tmp14_;
 #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp18_ = self->priv->_text;
+		_tmp15_ = ret;
 #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp19_ = title;
+		_tmp16_ = self->priv->_text;
 #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp20_ = search_condition_text_string_match (self, _tmp18_, _tmp19_);
+		_tmp17_ = title;
 #line 313 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		ret = _tmp17_ | _tmp20_;
+		ret = _tmp15_ | search_condition_text_string_match (self, _tmp16_, _tmp17_);
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (title);
 #line 310 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (_tmp5_);
-#line 2634 "SearchBoolean.c"
+#line 2666 "SearchBoolean.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp22_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+	_tmp19_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp23_ = _tmp22_;
+	_tmp20_ = _tmp19_;
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp23_) {
+	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp20_) {
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp21_ = TRUE;
-#line 2644 "SearchBoolean.c"
+		_tmp18_ = TRUE;
+#line 2676 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp24_;
-		SearchConditionSearchType _tmp25_;
+		SearchConditionSearchType _tmp21_;
+		SearchConditionSearchType _tmp22_;
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp24_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+		_tmp21_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp25_ = _tmp24_;
+		_tmp22_ = _tmp21_;
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp21_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp25_;
-#line 2654 "SearchBoolean.c"
+		_tmp18_ = SEARCH_CONDITION_SEARCH_TYPE_TAG == _tmp22_;
+#line 2686 "SearchBoolean.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp21_) {
-#line 2658 "SearchBoolean.c"
+	if (_tmp18_) {
+#line 2690 "SearchBoolean.c"
 		GeeList* tag_list = NULL;
-		TagSourceCollection* _tmp26_;
-		MediaSource* _tmp27_;
-		GeeList* _tmp28_;
-		GeeList* _tmp29_;
-#line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp26_ = tag_global;
+		TagSourceCollection* _tmp23_;
+		GeeList* _tmp24_;
+		GeeList* _tmp25_;
 #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp27_ = source;
+		_tmp23_ = tag_global;
 #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp28_ = tag_source_collection_fetch_for_source (_tmp26_, _tmp27_);
+		_tmp24_ = tag_source_collection_fetch_for_source (_tmp23_, source);
 #line 318 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		tag_list = _tmp28_;
+		tag_list = _tmp24_;
 #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp29_ = tag_list;
+		_tmp25_ = tag_list;
 #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (NULL != _tmp29_) {
-#line 2676 "SearchBoolean.c"
+		if (NULL != _tmp25_) {
+#line 2705 "SearchBoolean.c"
 			gchar* itag = NULL;
 			{
 				GeeList* _tag_list = NULL;
-				GeeList* _tmp30_;
-				GeeList* _tmp31_;
+				GeeList* _tmp26_;
+				GeeList* _tmp27_;
 				gint _tag_size = 0;
-				GeeList* _tmp32_;
-				gint _tmp33_;
-				gint _tmp34_;
+				GeeList* _tmp28_;
+				gint _tmp29_;
+				gint _tmp30_;
 				gint _tag_index = 0;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp30_ = tag_list;
+				_tmp26_ = tag_list;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp31_ = _g_object_ref0 (_tmp30_);
+				_tmp27_ = _g_object_ref0 (_tmp26_);
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tag_list = _tmp31_;
+				_tag_list = _tmp27_;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp32_ = _tag_list;
+				_tmp28_ = _tag_list;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
+				_tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp34_ = _tmp33_;
+				_tmp30_ = _tmp29_;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tag_size = _tmp34_;
+				_tag_size = _tmp30_;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tag_index = -1;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				while (TRUE) {
-#line 2705 "SearchBoolean.c"
-					gint _tmp35_;
-					gint _tmp36_;
-					gint _tmp37_;
+#line 2734 "SearchBoolean.c"
+					gint _tmp31_;
+					gint _tmp32_;
+					gint _tmp33_;
 					Tag* tag = NULL;
-					GeeList* _tmp38_;
-					gint _tmp39_;
-					gpointer _tmp40_;
-					Tag* _tmp41_;
-					gchar* _tmp42_;
-					gchar* _tmp43_;
-					gchar* _tmp44_;
-					gboolean _tmp45_;
-					const gchar* _tmp46_;
-					const gchar* _tmp47_;
-					gboolean _tmp48_;
+					GeeList* _tmp34_;
+					gint _tmp35_;
+					gpointer _tmp36_;
+					Tag* _tmp37_;
+					gchar* _tmp38_;
+					gchar* _tmp39_;
+					gchar* _tmp40_;
+					gboolean _tmp41_;
+					const gchar* _tmp42_;
+					const gchar* _tmp43_;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp35_ = _tag_index;
+					_tmp31_ = _tag_index;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tag_index = _tmp35_ + 1;
+					_tag_index = _tmp31_ + 1;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp36_ = _tag_index;
+					_tmp32_ = _tag_index;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp37_ = _tag_size;
+					_tmp33_ = _tag_size;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					if (!(_tmp36_ < _tmp37_)) {
+					if (!(_tmp32_ < _tmp33_)) {
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 						break;
-#line 2733 "SearchBoolean.c"
+#line 2761 "SearchBoolean.c"
 					}
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp38_ = _tag_list;
+					_tmp34_ = _tag_list;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp39_ = _tag_index;
+					_tmp35_ = _tag_index;
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp40_ = gee_list_get (_tmp38_, _tmp39_);
+					_tmp36_ = gee_list_get (_tmp34_, _tmp35_);
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					tag = (Tag*) _tmp40_;
+					tag = (Tag*) _tmp36_;
 #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp41_ = tag;
+					_tmp37_ = tag;
 #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp42_ = tag_get_searchable_name (_tmp41_);
+					_tmp38_ = tag_get_searchable_name (_tmp37_);
 #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp43_ = _tmp42_;
+					_tmp39_ = _tmp38_;
 #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp44_ = g_utf8_strdown (_tmp43_, (gssize) -1);
+					_tmp40_ = g_utf8_strdown (_tmp39_, (gssize) -1);
 #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_g_free0 (itag);
 #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					itag = _tmp44_;
+					itag = _tmp40_;
 #line 322 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_g_free0 (_tmp43_);
-#line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp45_ = ret;
+					_g_free0 (_tmp39_);
 #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp46_ = self->priv->_text;
+					_tmp41_ = ret;
 #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp47_ = itag;
+					_tmp42_ = self->priv->_text;
 #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp48_ = search_condition_text_string_match (self, _tmp46_, _tmp47_);
+					_tmp43_ = itag;
 #line 323 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					ret = _tmp45_ | _tmp48_;
+					ret = _tmp41_ | search_condition_text_string_match (self, _tmp42_, _tmp43_);
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_g_object_unref0 (tag);
-#line 2769 "SearchBoolean.c"
+#line 2795 "SearchBoolean.c"
 				}
 #line 321 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_g_object_unref0 (_tag_list);
-#line 2773 "SearchBoolean.c"
+#line 2799 "SearchBoolean.c"
 			}
 #line 319 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_free0 (itag);
-#line 2777 "SearchBoolean.c"
+#line 2803 "SearchBoolean.c"
 		} else {
-			gboolean _tmp49_;
-			const gchar* _tmp50_;
-			gboolean _tmp51_;
+			gboolean _tmp44_;
+			const gchar* _tmp45_;
 #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp49_ = ret;
+			_tmp44_ = ret;
 #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp50_ = self->priv->_text;
+			_tmp45_ = self->priv->_text;
 #line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp51_ = search_condition_text_string_match (self, _tmp50_, NULL);
-#line 326 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			ret = _tmp49_ | _tmp51_;
-#line 2790 "SearchBoolean.c"
+			ret = _tmp44_ | search_condition_text_string_match (self, _tmp45_, NULL);
+#line 2813 "SearchBoolean.c"
 		}
 #line 317 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (tag_list);
-#line 2794 "SearchBoolean.c"
+#line 2817 "SearchBoolean.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp53_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+	_tmp47_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp54_ = _tmp53_;
+	_tmp48_ = _tmp47_;
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp54_) {
+	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp48_) {
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp52_ = TRUE;
-#line 2804 "SearchBoolean.c"
+		_tmp46_ = TRUE;
+#line 2827 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp55_;
-		SearchConditionSearchType _tmp56_;
+		SearchConditionSearchType _tmp49_;
+		SearchConditionSearchType _tmp50_;
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp55_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+		_tmp49_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp56_ = _tmp55_;
+		_tmp50_ = _tmp49_;
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp52_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp56_;
-#line 2814 "SearchBoolean.c"
+		_tmp46_ = SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME == _tmp50_;
+#line 2837 "SearchBoolean.c"
 	}
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp52_) {
-#line 2818 "SearchBoolean.c"
-		gchar* _tmp57_ = NULL;
-		MediaSource* _tmp58_;
-		Event* _tmp59_;
-		Event* _tmp60_;
-		gboolean _tmp61_;
+	if (_tmp46_) {
+#line 2841 "SearchBoolean.c"
+		gchar* _tmp51_ = NULL;
+		Event* _tmp52_;
+		Event* _tmp53_;
+		gboolean _tmp54_;
 		gchar* event_name = NULL;
-		gchar* _tmp70_;
-		gboolean _tmp71_;
-		const gchar* _tmp72_;
-		const gchar* _tmp73_;
-		gboolean _tmp74_;
+		gchar* _tmp62_;
+		gboolean _tmp63_;
+		const gchar* _tmp64_;
+		const gchar* _tmp65_;
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp58_ = source;
+		_tmp52_ = media_source_get_event (source);
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp59_ = media_source_get_event (_tmp58_);
+		_tmp53_ = _tmp52_;
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp60_ = _tmp59_;
+		_tmp54_ = NULL != _tmp53_;
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp61_ = NULL != _tmp60_;
+		_g_object_unref0 (_tmp53_);
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_object_unref0 (_tmp60_);
-#line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (_tmp61_) {
-#line 2842 "SearchBoolean.c"
-			MediaSource* _tmp62_;
-			Event* _tmp63_;
-			Event* _tmp64_;
-			gchar* _tmp65_;
-			gchar* _tmp66_;
-			gchar* _tmp67_;
-			gchar* _tmp68_;
-			gchar* _tmp69_;
-#line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp62_ = source;
+		if (_tmp54_) {
+#line 2861 "SearchBoolean.c"
+			Event* _tmp55_;
+			Event* _tmp56_;
+			gchar* _tmp57_;
+			gchar* _tmp58_;
+			gchar* _tmp59_;
+			gchar* _tmp60_;
+			gchar* _tmp61_;
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp63_ = media_source_get_event (_tmp62_);
+			_tmp55_ = media_source_get_event (source);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp64_ = _tmp63_;
+			_tmp56_ = _tmp55_;
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp65_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_DATA_OBJECT, DataObject));
+			_tmp57_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_DATA_OBJECT, DataObject));
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp66_ = _tmp65_;
+			_tmp58_ = _tmp57_;
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp67_ = g_utf8_strdown (_tmp66_, (gssize) -1);
+			_tmp59_ = g_utf8_strdown (_tmp58_, (gssize) -1);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp68_ = _tmp67_;
+			_tmp60_ = _tmp59_;
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp69_ = string_remove_diacritics (_tmp68_);
+			_tmp61_ = string_remove_diacritics (_tmp60_);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_free0 (_tmp57_);
+			_g_free0 (_tmp51_);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp57_ = _tmp69_;
+			_tmp51_ = _tmp61_;
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_free0 (_tmp68_);
+			_g_free0 (_tmp60_);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_free0 (_tmp66_);
+			_g_free0 (_tmp58_);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_object_unref0 (_tmp64_);
-#line 2877 "SearchBoolean.c"
+			_g_object_unref0 (_tmp56_);
+#line 2893 "SearchBoolean.c"
 		} else {
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_free0 (_tmp57_);
+			_g_free0 (_tmp51_);
 #line 333 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp57_ = NULL;
-#line 2883 "SearchBoolean.c"
+			_tmp51_ = NULL;
+#line 2899 "SearchBoolean.c"
 		}
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp70_ = g_strdup (_tmp57_);
+		_tmp62_ = g_strdup (_tmp51_);
 #line 332 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		event_name = _tmp70_;
+		event_name = _tmp62_;
 #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp71_ = ret;
+		_tmp63_ = ret;
 #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp72_ = self->priv->_text;
+		_tmp64_ = self->priv->_text;
 #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp73_ = event_name;
+		_tmp65_ = event_name;
 #line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp74_ = search_condition_text_string_match (self, _tmp72_, _tmp73_);
-#line 334 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		ret = _tmp71_ | _tmp74_;
+		ret = _tmp63_ | search_condition_text_string_match (self, _tmp64_, _tmp65_);
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (event_name);
 #line 331 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp57_);
-#line 2903 "SearchBoolean.c"
+		_g_free0 (_tmp51_);
+#line 2917 "SearchBoolean.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp76_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+	_tmp67_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp77_ = _tmp76_;
+	_tmp68_ = _tmp67_;
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp77_) {
+	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp68_) {
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp75_ = TRUE;
-#line 2913 "SearchBoolean.c"
+		_tmp66_ = TRUE;
+#line 2927 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp78_;
-		SearchConditionSearchType _tmp79_;
+		SearchConditionSearchType _tmp69_;
+		SearchConditionSearchType _tmp70_;
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp78_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+		_tmp69_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp79_ = _tmp78_;
+		_tmp70_ = _tmp69_;
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp75_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp79_;
-#line 2923 "SearchBoolean.c"
+		_tmp66_ = SEARCH_CONDITION_SEARCH_TYPE_COMMENT == _tmp70_;
+#line 2937 "SearchBoolean.c"
 	}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp75_) {
-#line 2927 "SearchBoolean.c"
+	if (_tmp66_) {
+#line 2941 "SearchBoolean.c"
 		gchar* comment = NULL;
-		MediaSource* _tmp80_;
-		gchar* _tmp81_;
-		const gchar* _tmp82_;
-#line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp80_ = source;
+		gchar* _tmp71_;
+		const gchar* _tmp72_;
 #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp81_ = media_source_get_comment (_tmp80_);
+		_tmp71_ = media_source_get_comment (source);
 #line 339 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		comment = _tmp81_;
+		comment = _tmp71_;
 #line 340 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp82_ = comment;
+		_tmp72_ = comment;
 #line 340 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (NULL != _tmp82_) {
-#line 2942 "SearchBoolean.c"
-			gboolean _tmp83_;
-			const gchar* _tmp84_;
-			const gchar* _tmp85_;
-			gchar* _tmp86_;
-			gchar* _tmp87_;
-			gchar* _tmp88_;
-			gchar* _tmp89_;
-			gboolean _tmp90_;
-#line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp83_ = ret;
+		if (NULL != _tmp72_) {
+#line 2953 "SearchBoolean.c"
+			gboolean _tmp73_;
+			const gchar* _tmp74_;
+			const gchar* _tmp75_;
+			gchar* _tmp76_;
+			gchar* _tmp77_;
+			gchar* _tmp78_;
+			gchar* _tmp79_;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp84_ = self->priv->_text;
+			_tmp73_ = ret;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp85_ = comment;
+			_tmp74_ = self->priv->_text;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp86_ = g_utf8_strdown (_tmp85_, (gssize) -1);
+			_tmp75_ = comment;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp87_ = _tmp86_;
+			_tmp76_ = g_utf8_strdown (_tmp75_, (gssize) -1);
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp88_ = string_remove_diacritics (_tmp87_);
+			_tmp77_ = _tmp76_;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp89_ = _tmp88_;
+			_tmp78_ = string_remove_diacritics (_tmp77_);
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp90_ = search_condition_text_string_match (self, _tmp84_, _tmp89_);
+			_tmp79_ = _tmp78_;
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			ret = _tmp83_ | _tmp90_;
+			ret = _tmp73_ | search_condition_text_string_match (self, _tmp74_, _tmp79_);
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_free0 (_tmp89_);
+			_g_free0 (_tmp79_);
 #line 341 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_g_free0 (_tmp87_);
-#line 2973 "SearchBoolean.c"
+			_g_free0 (_tmp77_);
+#line 2981 "SearchBoolean.c"
 		}
 #line 338 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_free0 (comment);
-#line 2977 "SearchBoolean.c"
+#line 2985 "SearchBoolean.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp92_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+	_tmp81_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp93_ = _tmp92_;
+	_tmp82_ = _tmp81_;
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp93_) {
+	if (SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT == _tmp82_) {
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp91_ = TRUE;
-#line 2987 "SearchBoolean.c"
+		_tmp80_ = TRUE;
+#line 2995 "SearchBoolean.c"
 	} else {
-		SearchConditionSearchType _tmp94_;
-		SearchConditionSearchType _tmp95_;
+		SearchConditionSearchType _tmp83_;
+		SearchConditionSearchType _tmp84_;
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp94_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
+		_tmp83_ = search_condition_get_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition));
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp95_ = _tmp94_;
+		_tmp84_ = _tmp83_;
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp91_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp95_;
-#line 2997 "SearchBoolean.c"
+		_tmp80_ = SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME == _tmp84_;
+#line 3005 "SearchBoolean.c"
 	}
 #line 345 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp91_) {
-#line 3001 "SearchBoolean.c"
-		gboolean _tmp96_;
-		const gchar* _tmp97_;
-		MediaSource* _tmp98_;
-		gchar* _tmp99_;
-		gchar* _tmp100_;
-		gchar* _tmp101_;
-		gchar* _tmp102_;
-		gchar* _tmp103_;
-		gchar* _tmp104_;
-		gboolean _tmp105_;
+	if (_tmp80_) {
+#line 3009 "SearchBoolean.c"
+		gboolean _tmp85_;
+		const gchar* _tmp86_;
+		gchar* _tmp87_;
+		gchar* _tmp88_;
+		gchar* _tmp89_;
+		gchar* _tmp90_;
+		gchar* _tmp91_;
+		gchar* _tmp92_;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp96_ = ret;
-#line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp97_ = self->priv->_text;
+		_tmp85_ = ret;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp98_ = source;
+		_tmp86_ = self->priv->_text;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp99_ = media_source_get_basename (_tmp98_);
+		_tmp87_ = media_source_get_basename (source);
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp100_ = _tmp99_;
+		_tmp88_ = _tmp87_;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp101_ = g_utf8_strdown (_tmp100_, (gssize) -1);
+		_tmp89_ = g_utf8_strdown (_tmp88_, (gssize) -1);
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp102_ = _tmp101_;
+		_tmp90_ = _tmp89_;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp103_ = string_remove_diacritics (_tmp102_);
+		_tmp91_ = string_remove_diacritics (_tmp90_);
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp104_ = _tmp103_;
+		_tmp92_ = _tmp91_;
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp105_ = search_condition_text_string_match (self, _tmp97_, _tmp104_);
+		ret = _tmp85_ | search_condition_text_string_match (self, _tmp86_, _tmp92_);
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		ret = _tmp96_ | _tmp105_;
+		_g_free0 (_tmp92_);
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp104_);
+		_g_free0 (_tmp90_);
 #line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp102_);
-#line 346 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_g_free0 (_tmp100_);
-#line 3040 "SearchBoolean.c"
+		_g_free0 (_tmp88_);
+#line 3042 "SearchBoolean.c"
 	}
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp107_ = self->priv->_context;
+	_tmp94_ = self->priv->_context;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp107_ == SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN) {
-#line 3046 "SearchBoolean.c"
-		gboolean _tmp108_;
+	if (_tmp94_ == SEARCH_CONDITION_TEXT_CONTEXT_DOES_NOT_CONTAIN) {
+#line 3048 "SearchBoolean.c"
+		gboolean _tmp95_;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp108_ = ret;
+		_tmp95_ = ret;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp106_ = !_tmp108_;
-#line 3052 "SearchBoolean.c"
+		_tmp93_ = !_tmp95_;
+#line 3054 "SearchBoolean.c"
 	} else {
-		gboolean _tmp109_;
+		gboolean _tmp96_;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp109_ = ret;
+		_tmp96_ = ret;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp106_ = _tmp109_;
-#line 3059 "SearchBoolean.c"
+		_tmp93_ = _tmp96_;
+#line 3061 "SearchBoolean.c"
 	}
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	result = _tmp106_;
+	result = _tmp93_;
 #line 349 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3065 "SearchBoolean.c"
+#line 3067 "SearchBoolean.c"
 }
 
 
-const gchar* search_condition_text_get_text (SearchConditionText* self) {
+const gchar*
+search_condition_text_get_text (SearchConditionText* self)
+{
 	const gchar* result;
 	const gchar* _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3077,28 +3081,30 @@ const gchar* search_condition_text_get_text (SearchConditionText* self) {
 	result = _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3080 "SearchBoolean.c"
+#line 3084 "SearchBoolean.c"
 }
 
 
-static void search_condition_text_set_text (SearchConditionText* self, const gchar* value) {
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+static void
+search_condition_text_set_text (SearchConditionText* self,
+                                const gchar* value)
+{
+	gchar* _tmp0_;
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self));
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (value);
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_free0 (self->priv->_text);
 #line 268 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_text = _tmp1_;
-#line 3097 "SearchBoolean.c"
+	self->priv->_text = _tmp0_;
+#line 3101 "SearchBoolean.c"
 }
 
 
-SearchConditionTextContext search_condition_text_get_context (SearchConditionText* self) {
+SearchConditionTextContext
+search_condition_text_get_context (SearchConditionText* self)
+{
 	SearchConditionTextContext result;
 	SearchConditionTextContext _tmp0_;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3109,23 +3115,25 @@ SearchConditionTextContext search_condition_text_get_context (SearchConditionTex
 	result = _tmp0_;
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3112 "SearchBoolean.c"
+#line 3118 "SearchBoolean.c"
 }
 
 
-static void search_condition_text_set_context (SearchConditionText* self, SearchConditionTextContext value) {
-	SearchConditionTextContext _tmp0_;
+static void
+search_condition_text_set_context (SearchConditionText* self,
+                                   SearchConditionTextContext value)
+{
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_TEXT (self));
 #line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 271 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_context = _tmp0_;
-#line 3124 "SearchBoolean.c"
+	self->priv->_context = value;
+#line 3130 "SearchBoolean.c"
 }
 
 
-static void search_condition_text_class_init (SearchConditionTextClass * klass) {
+static void
+search_condition_text_class_init (SearchConditionTextClass * klass)
+{
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_text_parent_class = g_type_class_peek_parent (klass);
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3134,18 +3142,22 @@ static void search_condition_text_class_init (SearchConditionTextClass * klass)
 	g_type_class_add_private (klass, sizeof (SearchConditionTextPrivate));
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_text_real_predicate;
-#line 3137 "SearchBoolean.c"
+#line 3145 "SearchBoolean.c"
 }
 
 
-static void search_condition_text_instance_init (SearchConditionText * self) {
+static void
+search_condition_text_instance_init (SearchConditionText * self)
+{
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_TEXT_GET_PRIVATE (self);
-#line 3144 "SearchBoolean.c"
+#line 3154 "SearchBoolean.c"
 }
 
 
-static void search_condition_text_finalize (SearchCondition * obj) {
+static void
+search_condition_text_finalize (SearchCondition * obj)
+{
 	SearchConditionText * self;
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_TEXT, SearchConditionText);
@@ -3153,11 +3165,13 @@ static void search_condition_text_finalize (SearchCondition * obj) {
 	_g_free0 (self->priv->_text);
 #line 202 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_text_parent_class)->finalize (obj);
-#line 3156 "SearchBoolean.c"
+#line 3168 "SearchBoolean.c"
 }
 
 
-GType search_condition_text_get_type (void) {
+GType
+search_condition_text_get_type (void)
+{
 	static volatile gsize search_condition_text_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_text_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchConditionTextClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_text_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionText), 0, (GInstanceInitFunc) search_condition_text_instance_init, NULL };
@@ -3169,13 +3183,15 @@ GType search_condition_text_get_type (void) {
 }
 
 
-gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeContext self) {
+gchar*
+search_condition_media_type_context_to_string (SearchConditionMediaTypeContext self)
+{
 	gchar* result = NULL;
 #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS:
-#line 3178 "SearchBoolean.c"
+#line 3194 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3184,11 +3200,11 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo
 			result = _tmp0_;
 #line 362 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3187 "SearchBoolean.c"
+#line 3203 "SearchBoolean.c"
 		}
 #line 360 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT:
-#line 3191 "SearchBoolean.c"
+#line 3207 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3197,57 +3213,52 @@ gchar* search_condition_media_type_context_to_string (SearchConditionMediaTypeCo
 			result = _tmp1_;
 #line 365 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3200 "SearchBoolean.c"
+#line 3216 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 368 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:368: unrecognized media search context enumeration " \
 "value");
-#line 3206 "SearchBoolean.c"
+#line 3222 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionMediaTypeContext search_condition_media_type_context_from_string (const gchar* str) {
+SearchConditionMediaTypeContext
+search_condition_media_type_context_from_string (const gchar* str)
+{
 	SearchConditionMediaTypeContext result = 0;
-	const gchar* _tmp0_;
 #line 372 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 373 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 373 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "IS") == 0) {
+	if (g_strcmp0 (str, "IS") == 0) {
 #line 374 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 374 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3225 "SearchBoolean.c"
+#line 3240 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
-#line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
 #line 376 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "IS_NOT") == 0) {
+		if (g_strcmp0 (str, "IS_NOT") == 0) {
 #line 377 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 377 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3236 "SearchBoolean.c"
+#line 3248 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
 #line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
-#line 380 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			g_error ("SearchBoolean.vala:380: unrecognized media search context name: %s", _tmp2_);
-#line 3243 "SearchBoolean.c"
+			g_error ("SearchBoolean.vala:380: unrecognized media search context name: %s", str);
+#line 3252 "SearchBoolean.c"
 		}
 	}
 }
 
 
-GType search_condition_media_type_context_get_type (void) {
+GType
+search_condition_media_type_context_get_type (void)
+{
 	static volatile gsize search_condition_media_type_context_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_media_type_context_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS, "SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS", "is"}, {SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT, "SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT", "is-not"}, {0, NULL, NULL}};
@@ -3259,13 +3270,15 @@ GType search_condition_media_type_context_get_type (void) {
 }
 
 
-gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTypeMediaType self) {
+gchar*
+search_condition_media_type_media_type_to_string (SearchConditionMediaTypeMediaType self)
+{
 	gchar* result = NULL;
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL:
-#line 3267 "SearchBoolean.c"
+#line 3280 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3274,11 +3287,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 			result = _tmp0_;
 #line 392 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3276 "SearchBoolean.c"
+#line 3289 "SearchBoolean.c"
 		}
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW:
-#line 3280 "SearchBoolean.c"
+#line 3293 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3287,11 +3300,11 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 			result = _tmp1_;
 #line 395 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3289 "SearchBoolean.c"
+#line 3302 "SearchBoolean.c"
 		}
 #line 390 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO:
-#line 3293 "SearchBoolean.c"
+#line 3306 "SearchBoolean.c"
 		{
 			gchar* _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3300,69 +3313,61 @@ gchar* search_condition_media_type_media_type_to_string (SearchConditionMediaTyp
 			result = _tmp2_;
 #line 398 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3302 "SearchBoolean.c"
+#line 3315 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 401 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:401: unrecognized media search type enumeration val" \
 "ue");
-#line 3308 "SearchBoolean.c"
+#line 3321 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionMediaTypeMediaType search_condition_media_type_media_type_from_string (const gchar* str) {
+SearchConditionMediaTypeMediaType
+search_condition_media_type_media_type_from_string (const gchar* str)
+{
 	SearchConditionMediaTypeMediaType result = 0;
-	const gchar* _tmp0_;
 #line 405 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 406 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 406 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "PHOTO_ALL") == 0) {
+	if (g_strcmp0 (str, "PHOTO_ALL") == 0) {
 #line 407 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL;
 #line 407 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3327 "SearchBoolean.c"
+#line 3339 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
-#line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
 #line 409 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "PHOTO_RAW") == 0) {
+		if (g_strcmp0 (str, "PHOTO_RAW") == 0) {
 #line 410 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW;
 #line 410 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3338 "SearchBoolean.c"
+#line 3347 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
 #line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
-#line 412 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (g_strcmp0 (_tmp2_, "VIDEO") == 0) {
+			if (g_strcmp0 (str, "VIDEO") == 0) {
 #line 413 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO;
 #line 413 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3349 "SearchBoolean.c"
+#line 3355 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_;
-#line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp3_ = str;
 #line 416 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				g_error ("SearchBoolean.vala:416: unrecognized media search type name: %s", _tmp3_);
-#line 3356 "SearchBoolean.c"
+				g_error ("SearchBoolean.vala:416: unrecognized media search type name: %s", str);
+#line 3359 "SearchBoolean.c"
 			}
 		}
 	}
 }
 
 
-GType search_condition_media_type_media_type_get_type (void) {
+GType
+search_condition_media_type_media_type_get_type (void)
+{
 	static volatile gsize search_condition_media_type_media_type_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_media_type_media_type_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL, "SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL", "photo-all"}, {SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW, "SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW", "photo-raw"}, {SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO, "SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO", "video"}, {0, NULL, NULL}};
@@ -3374,39 +3379,42 @@ GType search_condition_media_type_media_type_get_type (void) {
 }
 
 
-SearchConditionMediaType* search_condition_media_type_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) {
+SearchConditionMediaType*
+search_condition_media_type_construct (GType object_type,
+                                       SearchConditionSearchType search_type,
+                                       SearchConditionMediaTypeContext context,
+                                       SearchConditionMediaTypeMediaType media_type)
+{
 	SearchConditionMediaType* self = NULL;
-	SearchConditionSearchType _tmp0_;
-	SearchConditionMediaTypeContext _tmp1_;
-	SearchConditionMediaTypeMediaType _tmp2_;
 #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionMediaType*) search_condition_construct (object_type);
 #line 427 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = search_type;
-#line 427 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_);
-#line 428 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = context;
+	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type);
 #line 428 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_media_type_set_context (self, _tmp1_);
+	search_condition_media_type_set_context (self, context);
 #line 429 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = media_type;
-#line 429 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_media_type_set_media_type (self, _tmp2_);
+	search_condition_media_type_set_media_type (self, media_type);
 #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 3396 "SearchBoolean.c"
+#line 3397 "SearchBoolean.c"
 }
 
 
-SearchConditionMediaType* search_condition_media_type_new (SearchConditionSearchType search_type, SearchConditionMediaTypeContext context, SearchConditionMediaTypeMediaType media_type) {
+SearchConditionMediaType*
+search_condition_media_type_new (SearchConditionSearchType search_type,
+                                 SearchConditionMediaTypeContext context,
+                                 SearchConditionMediaTypeMediaType media_type)
+{
 #line 426 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_media_type_construct (TYPE_SEARCH_CONDITION_MEDIA_TYPE, search_type, context, media_type);
-#line 3403 "SearchBoolean.c"
+#line 3408 "SearchBoolean.c"
 }
 
 
-static gboolean search_condition_media_type_real_predicate (SearchCondition* base, MediaSource* source) {
+static gboolean
+search_condition_media_type_real_predicate (SearchCondition* base,
+                                            MediaSource* source)
+{
 	SearchConditionMediaType * self;
 	gboolean result = FALSE;
 	SearchConditionMediaTypeMediaType _tmp0_;
@@ -3420,107 +3428,91 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 	switch (_tmp0_) {
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_ALL:
-#line 3421 "SearchBoolean.c"
+#line 3429 "SearchBoolean.c"
 		{
-			MediaSource* _tmp1_;
-#line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp1_ = source;
 #line 438 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_PHOTO)) {
-#line 3428 "SearchBoolean.c"
-				SearchConditionMediaTypeContext _tmp2_;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO)) {
+#line 3433 "SearchBoolean.c"
+				SearchConditionMediaTypeContext _tmp1_;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp2_ = self->priv->_context;
+				_tmp1_ = self->priv->_context;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
+				result = _tmp1_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 439 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3436 "SearchBoolean.c"
+#line 3441 "SearchBoolean.c"
 			} else {
-				SearchConditionMediaTypeContext _tmp3_;
+				SearchConditionMediaTypeContext _tmp2_;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp3_ = self->priv->_context;
+				_tmp2_ = self->priv->_context;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				result = _tmp3_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
+				result = _tmp2_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 441 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3445 "SearchBoolean.c"
+#line 3450 "SearchBoolean.c"
 			}
 		}
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_PHOTO_RAW:
-#line 3450 "SearchBoolean.c"
+#line 3455 "SearchBoolean.c"
 		{
-			gboolean _tmp4_ = FALSE;
-			MediaSource* _tmp5_;
-#line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp5_ = source;
-#line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_PHOTO)) {
-#line 3458 "SearchBoolean.c"
-				MediaSource* _tmp6_;
-				PhotoFileFormat _tmp7_;
-#line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp6_ = source;
+			gboolean _tmp3_ = FALSE;
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp7_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo));
+			if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO)) {
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp4_ = _tmp7_ == PHOTO_FILE_FORMAT_RAW;
-#line 3467 "SearchBoolean.c"
+				_tmp3_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO, Photo)) == PHOTO_FILE_FORMAT_RAW;
+#line 3462 "SearchBoolean.c"
 			} else {
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp4_ = FALSE;
-#line 3471 "SearchBoolean.c"
+				_tmp3_ = FALSE;
+#line 3466 "SearchBoolean.c"
 			}
 #line 444 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (_tmp4_) {
-#line 3475 "SearchBoolean.c"
-				SearchConditionMediaTypeContext _tmp8_;
+			if (_tmp3_) {
+#line 3470 "SearchBoolean.c"
+				SearchConditionMediaTypeContext _tmp4_;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp8_ = self->priv->_context;
+				_tmp4_ = self->priv->_context;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				result = _tmp8_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
+				result = _tmp4_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 445 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3483 "SearchBoolean.c"
+#line 3478 "SearchBoolean.c"
 			} else {
-				SearchConditionMediaTypeContext _tmp9_;
+				SearchConditionMediaTypeContext _tmp5_;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp9_ = self->priv->_context;
+				_tmp5_ = self->priv->_context;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				result = _tmp9_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
+				result = _tmp5_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 447 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3492 "SearchBoolean.c"
+#line 3487 "SearchBoolean.c"
 			}
 		}
 #line 436 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MEDIA_TYPE_MEDIA_TYPE_VIDEO:
-#line 3497 "SearchBoolean.c"
+#line 3492 "SearchBoolean.c"
 		{
-			MediaSource* _tmp10_;
-#line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp10_ = source;
 #line 450 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO_SOURCE)) {
-#line 3504 "SearchBoolean.c"
-				SearchConditionMediaTypeContext _tmp11_;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO_SOURCE)) {
+#line 3496 "SearchBoolean.c"
+				SearchConditionMediaTypeContext _tmp6_;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp11_ = self->priv->_context;
+				_tmp6_ = self->priv->_context;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				result = _tmp11_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
+				result = _tmp6_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS;
 #line 451 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3512 "SearchBoolean.c"
+#line 3504 "SearchBoolean.c"
 			} else {
-				SearchConditionMediaTypeContext _tmp12_;
+				SearchConditionMediaTypeContext _tmp7_;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp12_ = self->priv->_context;
+				_tmp7_ = self->priv->_context;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				result = _tmp12_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
+				result = _tmp7_ == SEARCH_CONDITION_MEDIA_TYPE_CONTEXT_IS_NOT;
 #line 453 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 3521 "SearchBoolean.c"
+#line 3513 "SearchBoolean.c"
 			}
 		}
 		default:
@@ -3528,13 +3520,15 @@ static gboolean search_condition_media_type_real_predicate (SearchCondition* bas
 #line 456 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:456: unrecognized media search type enumeration val" \
 "ue");
-#line 3528 "SearchBoolean.c"
+#line 3520 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (SearchConditionMediaType* self) {
+SearchConditionMediaTypeMediaType
+search_condition_media_type_get_media_type (SearchConditionMediaType* self)
+{
 	SearchConditionMediaTypeMediaType result;
 	SearchConditionMediaTypeMediaType _tmp0_;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3545,23 +3539,25 @@ SearchConditionMediaTypeMediaType search_condition_media_type_get_media_type (Se
 	result = _tmp0_;
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3545 "SearchBoolean.c"
+#line 3539 "SearchBoolean.c"
 }
 
 
-static void search_condition_media_type_set_media_type (SearchConditionMediaType* self, SearchConditionMediaTypeMediaType value) {
-	SearchConditionMediaTypeMediaType _tmp0_;
+static void
+search_condition_media_type_set_media_type (SearchConditionMediaType* self,
+                                            SearchConditionMediaTypeMediaType value)
+{
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self));
 #line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 421 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_media_type = _tmp0_;
-#line 3557 "SearchBoolean.c"
+	self->priv->_media_type = value;
+#line 3551 "SearchBoolean.c"
 }
 
 
-SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchConditionMediaType* self) {
+SearchConditionMediaTypeContext
+search_condition_media_type_get_context (SearchConditionMediaType* self)
+{
 	SearchConditionMediaTypeContext result;
 	SearchConditionMediaTypeContext _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3572,23 +3568,25 @@ SearchConditionMediaTypeContext search_condition_media_type_get_context (SearchC
 	result = _tmp0_;
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3572 "SearchBoolean.c"
+#line 3568 "SearchBoolean.c"
 }
 
 
-static void search_condition_media_type_set_context (SearchConditionMediaType* self, SearchConditionMediaTypeContext value) {
-	SearchConditionMediaTypeContext _tmp0_;
+static void
+search_condition_media_type_set_context (SearchConditionMediaType* self,
+                                         SearchConditionMediaTypeContext value)
+{
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MEDIA_TYPE (self));
 #line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 424 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_context = _tmp0_;
-#line 3584 "SearchBoolean.c"
+	self->priv->_context = value;
+#line 3580 "SearchBoolean.c"
 }
 
 
-static void search_condition_media_type_class_init (SearchConditionMediaTypeClass * klass) {
+static void
+search_condition_media_type_class_init (SearchConditionMediaTypeClass * klass)
+{
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_media_type_parent_class = g_type_class_peek_parent (klass);
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3597,28 +3595,34 @@ static void search_condition_media_type_class_init (SearchConditionMediaTypeClas
 	g_type_class_add_private (klass, sizeof (SearchConditionMediaTypePrivate));
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_media_type_real_predicate;
-#line 3597 "SearchBoolean.c"
+#line 3595 "SearchBoolean.c"
 }
 
 
-static void search_condition_media_type_instance_init (SearchConditionMediaType * self) {
+static void
+search_condition_media_type_instance_init (SearchConditionMediaType * self)
+{
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_MEDIA_TYPE_GET_PRIVATE (self);
 #line 3604 "SearchBoolean.c"
 }
 
 
-static void search_condition_media_type_finalize (SearchCondition * obj) {
+static void
+search_condition_media_type_finalize (SearchCondition * obj)
+{
 	SearchConditionMediaType * self;
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MEDIA_TYPE, SearchConditionMediaType);
 #line 354 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_media_type_parent_class)->finalize (obj);
-#line 3614 "SearchBoolean.c"
+#line 3616 "SearchBoolean.c"
 }
 
 
-GType search_condition_media_type_get_type (void) {
+GType
+search_condition_media_type_get_type (void)
+{
 	static volatile gsize search_condition_media_type_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_media_type_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchConditionMediaTypeClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_media_type_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionMediaType), 0, (GInstanceInitFunc) search_condition_media_type_instance_init, NULL };
@@ -3630,13 +3634,15 @@ GType search_condition_media_type_get_type (void) {
 }
 
 
-gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState self) {
+gchar*
+search_condition_flagged_state_to_string (SearchConditionFlaggedState self)
+{
 	gchar* result = NULL;
 #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_FLAGGED_STATE_FLAGGED:
-#line 3636 "SearchBoolean.c"
+#line 3642 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3645,11 +3651,11 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel
 			result = _tmp0_;
 #line 470 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3645 "SearchBoolean.c"
+#line 3651 "SearchBoolean.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED:
-#line 3649 "SearchBoolean.c"
+#line 3655 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3658,57 +3664,52 @@ gchar* search_condition_flagged_state_to_string (SearchConditionFlaggedState sel
 			result = _tmp1_;
 #line 473 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3658 "SearchBoolean.c"
+#line 3664 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 476 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:476: unrecognized flagged search state enumeration " \
 "value");
-#line 3664 "SearchBoolean.c"
+#line 3670 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionFlaggedState search_condition_flagged_state_from_string (const gchar* str) {
+SearchConditionFlaggedState
+search_condition_flagged_state_from_string (const gchar* str)
+{
 	SearchConditionFlaggedState result = 0;
-	const gchar* _tmp0_;
 #line 480 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 481 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 481 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "FLAGGED") == 0) {
+	if (g_strcmp0 (str, "FLAGGED") == 0) {
 #line 482 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_FLAGGED_STATE_FLAGGED;
 #line 482 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3683 "SearchBoolean.c"
+#line 3688 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
-#line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
 #line 484 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "UNFLAGGED") == 0) {
+		if (g_strcmp0 (str, "UNFLAGGED") == 0) {
 #line 485 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED;
 #line 485 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3694 "SearchBoolean.c"
+#line 3696 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
 #line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
-#line 488 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			g_error ("SearchBoolean.vala:488: unrecognized flagged search state name: %s", _tmp2_);
-#line 3701 "SearchBoolean.c"
+			g_error ("SearchBoolean.vala:488: unrecognized flagged search state name: %s", str);
+#line 3700 "SearchBoolean.c"
 		}
 	}
 }
 
 
-GType search_condition_flagged_state_get_type (void) {
+GType
+search_condition_flagged_state_get_type (void)
+{
 	static volatile gsize search_condition_flagged_state_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_flagged_state_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_FLAGGED_STATE_FLAGGED, "SEARCH_CONDITION_FLAGGED_STATE_FLAGGED", "flagged"}, {SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED, "SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED", "unflagged"}, {0, NULL, NULL}};
@@ -3720,34 +3721,38 @@ GType search_condition_flagged_state_get_type (void) {
 }
 
 
-SearchConditionFlagged* search_condition_flagged_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionFlaggedState state) {
+SearchConditionFlagged*
+search_condition_flagged_construct (GType object_type,
+                                    SearchConditionSearchType search_type,
+                                    SearchConditionFlaggedState state)
+{
 	SearchConditionFlagged* self = NULL;
-	SearchConditionSearchType _tmp0_;
-	SearchConditionFlaggedState _tmp1_;
 #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionFlagged*) search_condition_construct (object_type);
 #line 496 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = search_type;
-#line 496 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_);
-#line 497 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = state;
+	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type);
 #line 497 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_flagged_set_state (self, _tmp1_);
+	search_condition_flagged_set_state (self, state);
 #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 3735 "SearchBoolean.c"
+#line 3734 "SearchBoolean.c"
 }
 
 
-SearchConditionFlagged* search_condition_flagged_new (SearchConditionSearchType search_type, SearchConditionFlaggedState state) {
+SearchConditionFlagged*
+search_condition_flagged_new (SearchConditionSearchType search_type,
+                              SearchConditionFlaggedState state)
+{
 #line 495 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_flagged_construct (TYPE_SEARCH_CONDITION_FLAGGED, search_type, state);
-#line 3742 "SearchBoolean.c"
+#line 3744 "SearchBoolean.c"
 }
 
 
-static gboolean search_condition_flagged_real_predicate (SearchCondition* base, MediaSource* source) {
+static gboolean
+search_condition_flagged_real_predicate (SearchCondition* base,
+                                         MediaSource* source)
+{
 	SearchConditionFlagged * self;
 	gboolean result = FALSE;
 	SearchConditionFlaggedState _tmp0_;
@@ -3759,46 +3764,34 @@ static gboolean search_condition_flagged_real_predicate (SearchCondition* base,
 	_tmp0_ = self->priv->_state;
 #line 502 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_ == SEARCH_CONDITION_FLAGGED_STATE_FLAGGED) {
-#line 3758 "SearchBoolean.c"
-		MediaSource* _tmp1_;
-		gboolean _tmp2_;
 #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = source;
-#line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp2_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_FLAGGABLE, Flaggable));
-#line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		result = _tmp2_;
+		result = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_FLAGGABLE, Flaggable));
 #line 503 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3769 "SearchBoolean.c"
+#line 3767 "SearchBoolean.c"
 	} else {
-		SearchConditionFlaggedState _tmp3_;
+		SearchConditionFlaggedState _tmp1_;
 #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp3_ = self->priv->_state;
+		_tmp1_ = self->priv->_state;
 #line 504 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (_tmp3_ == SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED) {
-#line 3776 "SearchBoolean.c"
-			MediaSource* _tmp4_;
-			gboolean _tmp5_;
-#line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp4_ = source;
-#line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp5_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_FLAGGABLE, Flaggable));
+		if (_tmp1_ == SEARCH_CONDITION_FLAGGED_STATE_UNFLAGGED) {
 #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = !_tmp5_;
+			result = !flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_FLAGGABLE, Flaggable));
 #line 505 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3787 "SearchBoolean.c"
+#line 3778 "SearchBoolean.c"
 		} else {
 #line 507 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:507: unrecognized flagged search state");
-#line 3791 "SearchBoolean.c"
+#line 3782 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionFlagged* self) {
+SearchConditionFlaggedState
+search_condition_flagged_get_state (SearchConditionFlagged* self)
+{
 	SearchConditionFlaggedState result;
 	SearchConditionFlaggedState _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3809,23 +3802,25 @@ SearchConditionFlaggedState search_condition_flagged_get_state (SearchConditionF
 	result = _tmp0_;
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 3808 "SearchBoolean.c"
+#line 3801 "SearchBoolean.c"
 }
 
 
-static void search_condition_flagged_set_state (SearchConditionFlagged* self, SearchConditionFlaggedState value) {
-	SearchConditionFlaggedState _tmp0_;
+static void
+search_condition_flagged_set_state (SearchConditionFlagged* self,
+                                    SearchConditionFlaggedState value)
+{
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_FLAGGED (self));
 #line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 493 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_state = _tmp0_;
-#line 3820 "SearchBoolean.c"
+	self->priv->_state = value;
+#line 3813 "SearchBoolean.c"
 }
 
 
-static void search_condition_flagged_class_init (SearchConditionFlaggedClass * klass) {
+static void
+search_condition_flagged_class_init (SearchConditionFlaggedClass * klass)
+{
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_flagged_parent_class = g_type_class_peek_parent (klass);
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3834,28 +3829,34 @@ static void search_condition_flagged_class_init (SearchConditionFlaggedClass * k
 	g_type_class_add_private (klass, sizeof (SearchConditionFlaggedPrivate));
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_flagged_real_predicate;
-#line 3833 "SearchBoolean.c"
+#line 3828 "SearchBoolean.c"
 }
 
 
-static void search_condition_flagged_instance_init (SearchConditionFlagged * self) {
+static void
+search_condition_flagged_instance_init (SearchConditionFlagged * self)
+{
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_FLAGGED_GET_PRIVATE (self);
-#line 3840 "SearchBoolean.c"
+#line 3837 "SearchBoolean.c"
 }
 
 
-static void search_condition_flagged_finalize (SearchCondition * obj) {
+static void
+search_condition_flagged_finalize (SearchCondition * obj)
+{
 	SearchConditionFlagged * self;
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_FLAGGED, SearchConditionFlagged);
 #line 462 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_flagged_parent_class)->finalize (obj);
-#line 3850 "SearchBoolean.c"
+#line 3849 "SearchBoolean.c"
 }
 
 
-GType search_condition_flagged_get_type (void) {
+GType
+search_condition_flagged_get_type (void)
+{
 	static volatile gsize search_condition_flagged_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_flagged_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchConditionFlaggedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_flagged_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionFlagged), 0, (GInstanceInitFunc) search_condition_flagged_instance_init, NULL };
@@ -3867,13 +3868,15 @@ GType search_condition_flagged_get_type (void) {
 }
 
 
-gchar* search_condition_modified_context_to_string (SearchConditionModifiedContext self) {
+gchar*
+search_condition_modified_context_to_string (SearchConditionModifiedContext self)
+{
 	gchar* result = NULL;
 #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS:
-#line 3872 "SearchBoolean.c"
+#line 3875 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3882,11 +3885,11 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte
 			result = _tmp0_;
 #line 522 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3881 "SearchBoolean.c"
+#line 3884 "SearchBoolean.c"
 		}
 #line 520 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO:
-#line 3885 "SearchBoolean.c"
+#line 3888 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -3895,57 +3898,52 @@ gchar* search_condition_modified_context_to_string (SearchConditionModifiedConte
 			result = _tmp1_;
 #line 525 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3894 "SearchBoolean.c"
+#line 3897 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 528 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:528: unrecognized modified search context enumerati" \
 "on value");
-#line 3900 "SearchBoolean.c"
+#line 3903 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionModifiedContext search_condition_modified_context_from_string (const gchar* str) {
+SearchConditionModifiedContext
+search_condition_modified_context_from_string (const gchar* str)
+{
 	SearchConditionModifiedContext result = 0;
-	const gchar* _tmp0_;
 #line 532 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 533 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 533 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "HAS") == 0) {
+	if (g_strcmp0 (str, "HAS") == 0) {
 #line 534 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS;
 #line 534 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 3919 "SearchBoolean.c"
+#line 3921 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
 #line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
-#line 536 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "HAS_NO") == 0) {
+		if (g_strcmp0 (str, "HAS_NO") == 0) {
 #line 537 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO;
 #line 537 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 3930 "SearchBoolean.c"
+#line 3929 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
-#line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
 #line 540 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			g_error ("SearchBoolean.vala:540: unrecognized modified search context name: %s", _tmp2_);
-#line 3937 "SearchBoolean.c"
+			g_error ("SearchBoolean.vala:540: unrecognized modified search context name: %s", str);
+#line 3933 "SearchBoolean.c"
 		}
 	}
 }
 
 
-GType search_condition_modified_context_get_type (void) {
+GType
+search_condition_modified_context_get_type (void)
+{
 	static volatile gsize search_condition_modified_context_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_modified_context_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_MODIFIED_CONTEXT_HAS, "SEARCH_CONDITION_MODIFIED_CONTEXT_HAS", "has"}, {SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO, "SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO", "has-no"}, {0, NULL, NULL}};
@@ -3957,7 +3955,9 @@ GType search_condition_modified_context_get_type (void) {
 }
 
 
-gchar* search_condition_modified_state_to_string (SearchConditionModifiedState self) {
+gchar*
+search_condition_modified_state_to_string (SearchConditionModifiedState self)
+{
 	gchar* result = NULL;
 #line 550 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
@@ -4011,56 +4011,48 @@ gchar* search_condition_modified_state_to_string (SearchConditionModifiedState s
 }
 
 
-SearchConditionModifiedState search_condition_modified_state_from_string (const gchar* str) {
+SearchConditionModifiedState
+search_condition_modified_state_from_string (const gchar* str)
+{
 	SearchConditionModifiedState result = 0;
-	const gchar* _tmp0_;
 #line 565 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 566 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 566 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "MODIFIED") == 0) {
+	if (g_strcmp0 (str, "MODIFIED") == 0) {
 #line 567 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_MODIFIED_STATE_MODIFIED;
 #line 567 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4021 "SearchBoolean.c"
+#line 4020 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
-#line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
 #line 569 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "INTERNAL_CHANGES") == 0) {
+		if (g_strcmp0 (str, "INTERNAL_CHANGES") == 0) {
 #line 570 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES;
 #line 570 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4032 "SearchBoolean.c"
+#line 4028 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
 #line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
-#line 572 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (g_strcmp0 (_tmp2_, "EXTERNAL_CHANGES") == 0) {
+			if (g_strcmp0 (str, "EXTERNAL_CHANGES") == 0) {
 #line 573 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES;
 #line 573 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4043 "SearchBoolean.c"
+#line 4036 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_;
-#line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp3_ = str;
 #line 576 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				g_error ("SearchBoolean.vala:576: unrecognized modified search state name: %s", _tmp3_);
-#line 4050 "SearchBoolean.c"
+				g_error ("SearchBoolean.vala:576: unrecognized modified search state name: %s", str);
+#line 4040 "SearchBoolean.c"
 			}
 		}
 	}
 }
 
 
-GType search_condition_modified_state_get_type (void) {
+GType
+search_condition_modified_state_get_type (void)
+{
 	static volatile gsize search_condition_modified_state_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_modified_state_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_MODIFIED_STATE_MODIFIED, "SEARCH_CONDITION_MODIFIED_STATE_MODIFIED", "modified"}, {SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES, "SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES", "internal-changes"}, {SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES, "SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES", "external-changes"}, {0, NULL, NULL}};
@@ -4072,174 +4064,164 @@ GType search_condition_modified_state_get_type (void) {
 }
 
 
-SearchConditionModified* search_condition_modified_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) {
+SearchConditionModified*
+search_condition_modified_construct (GType object_type,
+                                     SearchConditionSearchType search_type,
+                                     SearchConditionModifiedContext context,
+                                     SearchConditionModifiedState state)
+{
 	SearchConditionModified* self = NULL;
-	SearchConditionSearchType _tmp0_;
-	SearchConditionModifiedContext _tmp1_;
-	SearchConditionModifiedState _tmp2_;
 #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionModified*) search_condition_construct (object_type);
 #line 587 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = search_type;
-#line 587 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_);
-#line 588 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = context;
+	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type);
 #line 588 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_modified_set_context (self, _tmp1_);
+	search_condition_modified_set_context (self, context);
 #line 589 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = state;
-#line 589 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_modified_set_state (self, _tmp2_);
+	search_condition_modified_set_state (self, state);
 #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 4090 "SearchBoolean.c"
+#line 4078 "SearchBoolean.c"
 }
 
 
-SearchConditionModified* search_condition_modified_new (SearchConditionSearchType search_type, SearchConditionModifiedContext context, SearchConditionModifiedState state) {
+SearchConditionModified*
+search_condition_modified_new (SearchConditionSearchType search_type,
+                               SearchConditionModifiedContext context,
+                               SearchConditionModifiedState state)
+{
 #line 586 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_modified_construct (TYPE_SEARCH_CONDITION_MODIFIED, search_type, context, state);
-#line 4097 "SearchBoolean.c"
+#line 4089 "SearchBoolean.c"
 }
 
 
-static gboolean search_condition_modified_real_predicate (SearchCondition* base, MediaSource* source) {
+static gboolean
+search_condition_modified_real_predicate (SearchCondition* base,
+                                          MediaSource* source)
+{
 	SearchConditionModified * self;
 	gboolean result = FALSE;
 	Photo* photo = NULL;
-	MediaSource* _tmp0_;
+	Photo* _tmp0_;
 	Photo* _tmp1_;
-	Photo* _tmp2_;
 	gboolean match = FALSE;
-	SearchConditionModifiedState _tmp3_;
-	gboolean _tmp15_;
+	SearchConditionModifiedState _tmp2_;
+	gboolean _tmp10_;
 #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified);
 #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
 #line 595 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = source;
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO) ? ((Photo*) source) : NULL);
 #line 595 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL);
-#line 595 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	photo = _tmp1_;
+	photo = _tmp0_;
 #line 596 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = photo;
+	_tmp1_ = photo;
 #line 596 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = FALSE;
 #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (photo);
 #line 597 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4131 "SearchBoolean.c"
+#line 4123 "SearchBoolean.c"
 	}
 #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp3_ = self->priv->_state;
+	_tmp2_ = self->priv->_state;
 #line 600 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp3_ == SEARCH_CONDITION_MODIFIED_STATE_MODIFIED) {
-#line 4137 "SearchBoolean.c"
-		gboolean _tmp4_ = FALSE;
-		Photo* _tmp5_;
-		gboolean _tmp6_;
-#line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp5_ = photo;
+	if (_tmp2_ == SEARCH_CONDITION_MODIFIED_STATE_MODIFIED) {
+#line 4129 "SearchBoolean.c"
+		gboolean _tmp3_ = FALSE;
+		Photo* _tmp4_;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp6_ = photo_has_transformations (_tmp5_);
+		_tmp4_ = photo;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (_tmp6_) {
+		if (photo_has_transformations (_tmp4_)) {
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp4_ = TRUE;
-#line 4149 "SearchBoolean.c"
+			_tmp3_ = TRUE;
+#line 4138 "SearchBoolean.c"
 		} else {
-			Photo* _tmp7_;
-			gboolean _tmp8_;
+			Photo* _tmp5_;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp7_ = photo;
+			_tmp5_ = photo;
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp8_ = photo_has_editable (_tmp7_);
-#line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp4_ = _tmp8_;
-#line 4159 "SearchBoolean.c"
+			_tmp3_ = photo_has_editable (_tmp5_);
+#line 4145 "SearchBoolean.c"
 		}
 #line 601 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		match = _tmp4_;
-#line 4163 "SearchBoolean.c"
+		match = _tmp3_;
+#line 4149 "SearchBoolean.c"
 	} else {
-		SearchConditionModifiedState _tmp9_;
+		SearchConditionModifiedState _tmp6_;
 #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp9_ = self->priv->_state;
+		_tmp6_ = self->priv->_state;
 #line 602 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (_tmp9_ == SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES) {
-#line 4170 "SearchBoolean.c"
-			Photo* _tmp10_;
-			gboolean _tmp11_;
-#line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp10_ = photo;
+		if (_tmp6_ == SEARCH_CONDITION_MODIFIED_STATE_INTERNAL_CHANGES) {
+#line 4156 "SearchBoolean.c"
+			Photo* _tmp7_;
 #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp11_ = photo_has_transformations (_tmp10_);
+			_tmp7_ = photo;
 #line 603 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			match = _tmp11_;
-#line 4179 "SearchBoolean.c"
+			match = photo_has_transformations (_tmp7_);
+#line 4162 "SearchBoolean.c"
 		} else {
-			SearchConditionModifiedState _tmp12_;
+			SearchConditionModifiedState _tmp8_;
 #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp12_ = self->priv->_state;
+			_tmp8_ = self->priv->_state;
 #line 604 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (_tmp12_ == SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES) {
-#line 4186 "SearchBoolean.c"
-				Photo* _tmp13_;
-				gboolean _tmp14_;
-#line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp13_ = photo;
+			if (_tmp8_ == SEARCH_CONDITION_MODIFIED_STATE_EXTERNAL_CHANGES) {
+#line 4169 "SearchBoolean.c"
+				Photo* _tmp9_;
 #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp14_ = photo_has_editable (_tmp13_);
+				_tmp9_ = photo;
 #line 605 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				match = _tmp14_;
-#line 4195 "SearchBoolean.c"
+				match = photo_has_editable (_tmp9_);
+#line 4175 "SearchBoolean.c"
 			} else {
 #line 607 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:607: unrecognized modified search state");
-#line 4199 "SearchBoolean.c"
+#line 4179 "SearchBoolean.c"
 			}
 		}
 	}
 #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp15_ = match;
+	_tmp10_ = match;
 #line 609 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp15_) {
-#line 4207 "SearchBoolean.c"
-		SearchConditionModifiedContext _tmp16_;
+	if (_tmp10_) {
+#line 4187 "SearchBoolean.c"
+		SearchConditionModifiedContext _tmp11_;
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp16_ = self->priv->_context;
+		_tmp11_ = self->priv->_context;
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		result = _tmp16_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS;
+		result = _tmp11_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS;
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (photo);
 #line 610 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4217 "SearchBoolean.c"
+#line 4197 "SearchBoolean.c"
 	} else {
-		SearchConditionModifiedContext _tmp17_;
+		SearchConditionModifiedContext _tmp12_;
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp17_ = self->priv->_context;
+		_tmp12_ = self->priv->_context;
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		result = _tmp17_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO;
+		result = _tmp12_ == SEARCH_CONDITION_MODIFIED_CONTEXT_HAS_NO;
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (photo);
 #line 612 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4228 "SearchBoolean.c"
+#line 4208 "SearchBoolean.c"
 	}
 #line 593 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_object_unref0 (photo);
-#line 4232 "SearchBoolean.c"
+#line 4212 "SearchBoolean.c"
 }
 
 
-SearchConditionModifiedState search_condition_modified_get_state (SearchConditionModified* self) {
+SearchConditionModifiedState
+search_condition_modified_get_state (SearchConditionModified* self)
+{
 	SearchConditionModifiedState result;
 	SearchConditionModifiedState _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4250,23 +4232,25 @@ SearchConditionModifiedState search_condition_modified_get_state (SearchConditio
 	result = _tmp0_;
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4247 "SearchBoolean.c"
+#line 4229 "SearchBoolean.c"
 }
 
 
-static void search_condition_modified_set_state (SearchConditionModified* self, SearchConditionModifiedState value) {
-	SearchConditionModifiedState _tmp0_;
+static void
+search_condition_modified_set_state (SearchConditionModified* self,
+                                     SearchConditionModifiedState value)
+{
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self));
 #line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 581 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_state = _tmp0_;
-#line 4259 "SearchBoolean.c"
+	self->priv->_state = value;
+#line 4241 "SearchBoolean.c"
 }
 
 
-SearchConditionModifiedContext search_condition_modified_get_context (SearchConditionModified* self) {
+SearchConditionModifiedContext
+search_condition_modified_get_context (SearchConditionModified* self)
+{
 	SearchConditionModifiedContext result;
 	SearchConditionModifiedContext _tmp0_;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4277,23 +4261,25 @@ SearchConditionModifiedContext search_condition_modified_get_context (SearchCond
 	result = _tmp0_;
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4274 "SearchBoolean.c"
+#line 4258 "SearchBoolean.c"
 }
 
 
-static void search_condition_modified_set_context (SearchConditionModified* self, SearchConditionModifiedContext value) {
-	SearchConditionModifiedContext _tmp0_;
+static void
+search_condition_modified_set_context (SearchConditionModified* self,
+                                       SearchConditionModifiedContext value)
+{
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_MODIFIED (self));
 #line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 584 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_context = _tmp0_;
-#line 4286 "SearchBoolean.c"
+	self->priv->_context = value;
+#line 4270 "SearchBoolean.c"
 }
 
 
-static void search_condition_modified_class_init (SearchConditionModifiedClass * klass) {
+static void
+search_condition_modified_class_init (SearchConditionModifiedClass * klass)
+{
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_modified_parent_class = g_type_class_peek_parent (klass);
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4302,28 +4288,34 @@ static void search_condition_modified_class_init (SearchConditionModifiedClass *
 	g_type_class_add_private (klass, sizeof (SearchConditionModifiedPrivate));
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_modified_real_predicate;
-#line 4299 "SearchBoolean.c"
+#line 4285 "SearchBoolean.c"
 }
 
 
-static void search_condition_modified_instance_init (SearchConditionModified * self) {
+static void
+search_condition_modified_instance_init (SearchConditionModified * self)
+{
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_MODIFIED_GET_PRIVATE (self);
-#line 4306 "SearchBoolean.c"
+#line 4294 "SearchBoolean.c"
 }
 
 
-static void search_condition_modified_finalize (SearchCondition * obj) {
+static void
+search_condition_modified_finalize (SearchCondition * obj)
+{
 	SearchConditionModified * self;
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_MODIFIED, SearchConditionModified);
 #line 513 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_modified_parent_class)->finalize (obj);
-#line 4316 "SearchBoolean.c"
+#line 4306 "SearchBoolean.c"
 }
 
 
-GType search_condition_modified_get_type (void) {
+GType
+search_condition_modified_get_type (void)
+{
 	static volatile gsize search_condition_modified_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_modified_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchConditionModifiedClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_modified_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionModified), 0, (GInstanceInitFunc) search_condition_modified_instance_init, NULL };
@@ -4335,13 +4327,15 @@ GType search_condition_modified_get_type (void) {
 }
 
 
-gchar* search_condition_rating_context_to_string (SearchConditionRatingContext self) {
+gchar*
+search_condition_rating_context_to_string (SearchConditionRatingContext self)
+{
 	gchar* result = NULL;
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER:
-#line 4338 "SearchBoolean.c"
+#line 4332 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4350,11 +4344,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 			result = _tmp0_;
 #line 627 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4347 "SearchBoolean.c"
+#line 4341 "SearchBoolean.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_ONLY:
-#line 4351 "SearchBoolean.c"
+#line 4345 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4363,11 +4357,11 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 			result = _tmp1_;
 #line 630 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4360 "SearchBoolean.c"
+#line 4354 "SearchBoolean.c"
 		}
 #line 625 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER:
-#line 4364 "SearchBoolean.c"
+#line 4358 "SearchBoolean.c"
 		{
 			gchar* _tmp2_;
 #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4376,69 +4370,61 @@ gchar* search_condition_rating_context_to_string (SearchConditionRatingContext s
 			result = _tmp2_;
 #line 633 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4373 "SearchBoolean.c"
+#line 4367 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 636 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:636: unrecognized rating search context enumeration" \
 " value");
-#line 4379 "SearchBoolean.c"
+#line 4373 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionRatingContext search_condition_rating_context_from_string (const gchar* str) {
+SearchConditionRatingContext
+search_condition_rating_context_from_string (const gchar* str)
+{
 	SearchConditionRatingContext result = 0;
-	const gchar* _tmp0_;
 #line 640 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 641 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 641 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "AND_HIGHER") == 0) {
+	if (g_strcmp0 (str, "AND_HIGHER") == 0) {
 #line 642 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER;
 #line 642 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4398 "SearchBoolean.c"
+#line 4391 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp1_;
 #line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp1_ = str;
-#line 644 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp1_, "ONLY") == 0) {
+		if (g_strcmp0 (str, "ONLY") == 0) {
 #line 645 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_RATING_CONTEXT_ONLY;
 #line 645 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4409 "SearchBoolean.c"
+#line 4399 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp2_;
-#line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp2_ = str;
 #line 647 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (g_strcmp0 (_tmp2_, "AND_LOWER") == 0) {
+			if (g_strcmp0 (str, "AND_LOWER") == 0) {
 #line 648 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER;
 #line 648 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4420 "SearchBoolean.c"
+#line 4407 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp3_;
 #line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp3_ = str;
-#line 651 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				g_error ("SearchBoolean.vala:651: unrecognized rating search context name: %s", _tmp3_);
-#line 4427 "SearchBoolean.c"
+				g_error ("SearchBoolean.vala:651: unrecognized rating search context name: %s", str);
+#line 4411 "SearchBoolean.c"
 			}
 		}
 	}
 }
 
 
-GType search_condition_rating_context_get_type (void) {
+GType
+search_condition_rating_context_get_type (void)
+{
 	static volatile gsize search_condition_rating_context_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_rating_context_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER, "SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER", "and-higher"}, {SEARCH_CONDITION_RATING_CONTEXT_ONLY, "SEARCH_CONDITION_RATING_CONTEXT_ONLY", "only"}, {SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER, "SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER", "and-lower"}, {0, NULL, NULL}};
@@ -4450,118 +4436,117 @@ GType search_condition_rating_context_get_type (void) {
 }
 
 
-SearchConditionRating* search_condition_rating_construct (GType object_type, SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) {
+SearchConditionRating*
+search_condition_rating_construct (GType object_type,
+                                   SearchConditionSearchType search_type,
+                                   Rating rating,
+                                   SearchConditionRatingContext context)
+{
 	SearchConditionRating* self = NULL;
-	SearchConditionSearchType _tmp0_;
-	Rating _tmp1_;
-	SearchConditionRatingContext _tmp2_;
 #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionRating*) search_condition_construct (object_type);
 #line 662 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = search_type;
-#line 662 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_);
-#line 663 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = rating;
+	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type);
 #line 663 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_rating_set_rating (self, _tmp1_);
+	search_condition_rating_set_rating (self, rating);
 #line 664 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = context;
-#line 664 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_rating_set_context (self, _tmp2_);
+	search_condition_rating_set_context (self, context);
 #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 4467 "SearchBoolean.c"
+#line 4449 "SearchBoolean.c"
 }
 
 
-SearchConditionRating* search_condition_rating_new (SearchConditionSearchType search_type, Rating rating, SearchConditionRatingContext context) {
+SearchConditionRating*
+search_condition_rating_new (SearchConditionSearchType search_type,
+                             Rating rating,
+                             SearchConditionRatingContext context)
+{
 #line 661 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_rating_construct (TYPE_SEARCH_CONDITION_RATING, search_type, rating, context);
-#line 4474 "SearchBoolean.c"
+#line 4460 "SearchBoolean.c"
 }
 
 
-static gboolean search_condition_rating_real_predicate (SearchCondition* base, MediaSource* source) {
+static gboolean
+search_condition_rating_real_predicate (SearchCondition* base,
+                                        MediaSource* source)
+{
 	SearchConditionRating * self;
 	gboolean result = FALSE;
 	Rating source_rating = 0;
-	MediaSource* _tmp0_;
-	Rating _tmp1_;
-	SearchConditionRatingContext _tmp2_;
+	SearchConditionRatingContext _tmp0_;
 #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating);
 #line 668 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
 #line 669 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = source;
-#line 669 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = media_source_get_rating (_tmp0_);
-#line 669 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	source_rating = _tmp1_;
+	source_rating = media_source_get_rating (source);
 #line 670 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = self->priv->_context;
+	_tmp0_ = self->priv->_context;
 #line 670 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp2_ == SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER) {
-#line 4499 "SearchBoolean.c"
-		Rating _tmp3_;
-		Rating _tmp4_;
+	if (_tmp0_ == SEARCH_CONDITION_RATING_CONTEXT_AND_HIGHER) {
+#line 4482 "SearchBoolean.c"
+		Rating _tmp1_;
+		Rating _tmp2_;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp3_ = source_rating;
+		_tmp1_ = source_rating;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp4_ = self->priv->_rating;
+		_tmp2_ = self->priv->_rating;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		result = _tmp3_ >= _tmp4_;
+		result = _tmp1_ >= _tmp2_;
 #line 671 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4510 "SearchBoolean.c"
+#line 4493 "SearchBoolean.c"
 	} else {
-		SearchConditionRatingContext _tmp5_;
+		SearchConditionRatingContext _tmp3_;
 #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp5_ = self->priv->_context;
+		_tmp3_ = self->priv->_context;
 #line 672 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (_tmp5_ == SEARCH_CONDITION_RATING_CONTEXT_ONLY) {
-#line 4517 "SearchBoolean.c"
-			Rating _tmp6_;
-			Rating _tmp7_;
+		if (_tmp3_ == SEARCH_CONDITION_RATING_CONTEXT_ONLY) {
+#line 4500 "SearchBoolean.c"
+			Rating _tmp4_;
+			Rating _tmp5_;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp6_ = source_rating;
+			_tmp4_ = source_rating;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp7_ = self->priv->_rating;
+			_tmp5_ = self->priv->_rating;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp6_ == _tmp7_;
+			result = _tmp4_ == _tmp5_;
 #line 673 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4528 "SearchBoolean.c"
+#line 4511 "SearchBoolean.c"
 		} else {
-			SearchConditionRatingContext _tmp8_;
+			SearchConditionRatingContext _tmp6_;
 #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp8_ = self->priv->_context;
+			_tmp6_ = self->priv->_context;
 #line 674 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (_tmp8_ == SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER) {
-#line 4535 "SearchBoolean.c"
-				Rating _tmp9_;
-				Rating _tmp10_;
+			if (_tmp6_ == SEARCH_CONDITION_RATING_CONTEXT_AND_LOWER) {
+#line 4518 "SearchBoolean.c"
+				Rating _tmp7_;
+				Rating _tmp8_;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp9_ = source_rating;
+				_tmp7_ = source_rating;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp10_ = self->priv->_rating;
+				_tmp8_ = self->priv->_rating;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				result = _tmp9_ <= _tmp10_;
+				result = _tmp7_ <= _tmp8_;
 #line 675 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4546 "SearchBoolean.c"
+#line 4529 "SearchBoolean.c"
 			} else {
 #line 677 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				g_error ("SearchBoolean.vala:677: unknown rating search context");
-#line 4550 "SearchBoolean.c"
+#line 4533 "SearchBoolean.c"
 			}
 		}
 	}
 }
 
 
-Rating search_condition_rating_get_rating (SearchConditionRating* self) {
+Rating
+search_condition_rating_get_rating (SearchConditionRating* self)
+{
 	Rating result;
 	Rating _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4572,23 +4557,25 @@ Rating search_condition_rating_get_rating (SearchConditionRating* self) {
 	result = _tmp0_;
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4568 "SearchBoolean.c"
+#line 4553 "SearchBoolean.c"
 }
 
 
-static void search_condition_rating_set_rating (SearchConditionRating* self, Rating value) {
-	Rating _tmp0_;
+static void
+search_condition_rating_set_rating (SearchConditionRating* self,
+                                    Rating value)
+{
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_RATING (self));
 #line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 656 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_rating = _tmp0_;
-#line 4580 "SearchBoolean.c"
+	self->priv->_rating = value;
+#line 4565 "SearchBoolean.c"
 }
 
 
-SearchConditionRatingContext search_condition_rating_get_context (SearchConditionRating* self) {
+SearchConditionRatingContext
+search_condition_rating_get_context (SearchConditionRating* self)
+{
 	SearchConditionRatingContext result;
 	SearchConditionRatingContext _tmp0_;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4599,23 +4586,25 @@ SearchConditionRatingContext search_condition_rating_get_context (SearchConditio
 	result = _tmp0_;
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 4595 "SearchBoolean.c"
+#line 4582 "SearchBoolean.c"
 }
 
 
-static void search_condition_rating_set_context (SearchConditionRating* self, SearchConditionRatingContext value) {
-	SearchConditionRatingContext _tmp0_;
+static void
+search_condition_rating_set_context (SearchConditionRating* self,
+                                     SearchConditionRatingContext value)
+{
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_RATING (self));
 #line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 659 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_context = _tmp0_;
-#line 4607 "SearchBoolean.c"
+	self->priv->_context = value;
+#line 4594 "SearchBoolean.c"
 }
 
 
-static void search_condition_rating_class_init (SearchConditionRatingClass * klass) {
+static void
+search_condition_rating_class_init (SearchConditionRatingClass * klass)
+{
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_rating_parent_class = g_type_class_peek_parent (klass);
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4624,28 +4613,34 @@ static void search_condition_rating_class_init (SearchConditionRatingClass * kla
 	g_type_class_add_private (klass, sizeof (SearchConditionRatingPrivate));
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_rating_real_predicate;
-#line 4620 "SearchBoolean.c"
+#line 4609 "SearchBoolean.c"
 }
 
 
-static void search_condition_rating_instance_init (SearchConditionRating * self) {
+static void
+search_condition_rating_instance_init (SearchConditionRating * self)
+{
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_RATING_GET_PRIVATE (self);
-#line 4627 "SearchBoolean.c"
+#line 4618 "SearchBoolean.c"
 }
 
 
-static void search_condition_rating_finalize (SearchCondition * obj) {
+static void
+search_condition_rating_finalize (SearchCondition * obj)
+{
 	SearchConditionRating * self;
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_RATING, SearchConditionRating);
 #line 618 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_rating_parent_class)->finalize (obj);
-#line 4637 "SearchBoolean.c"
+#line 4630 "SearchBoolean.c"
 }
 
 
-GType search_condition_rating_get_type (void) {
+GType
+search_condition_rating_get_type (void)
+{
 	static volatile gsize search_condition_rating_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_rating_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchConditionRatingClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_rating_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionRating), 0, (GInstanceInitFunc) search_condition_rating_instance_init, NULL };
@@ -4657,13 +4652,15 @@ GType search_condition_rating_get_type (void) {
 }
 
 
-gchar* search_condition_date_context_to_string (SearchConditionDateContext self) {
+gchar*
+search_condition_date_context_to_string (SearchConditionDateContext self)
+{
 	gchar* result = NULL;
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	switch (self) {
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_EXACT:
-#line 4659 "SearchBoolean.c"
+#line 4656 "SearchBoolean.c"
 		{
 			gchar* _tmp0_;
 #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4672,11 +4669,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp0_;
 #line 694 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4668 "SearchBoolean.c"
+#line 4665 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_AFTER:
-#line 4672 "SearchBoolean.c"
+#line 4669 "SearchBoolean.c"
 		{
 			gchar* _tmp1_;
 #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4685,11 +4682,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp1_;
 #line 697 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4681 "SearchBoolean.c"
+#line 4678 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BEFORE:
-#line 4685 "SearchBoolean.c"
+#line 4682 "SearchBoolean.c"
 		{
 			gchar* _tmp2_;
 #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4698,11 +4695,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp2_;
 #line 700 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4694 "SearchBoolean.c"
+#line 4691 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN:
-#line 4698 "SearchBoolean.c"
+#line 4695 "SearchBoolean.c"
 		{
 			gchar* _tmp3_;
 #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4711,11 +4708,11 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp3_;
 #line 703 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4707 "SearchBoolean.c"
+#line 4704 "SearchBoolean.c"
 		}
 #line 692 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET:
-#line 4711 "SearchBoolean.c"
+#line 4708 "SearchBoolean.c"
 		{
 			gchar* _tmp4_;
 #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4724,84 +4721,68 @@ gchar* search_condition_date_context_to_string (SearchConditionDateContext self)
 			result = _tmp4_;
 #line 706 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4720 "SearchBoolean.c"
+#line 4717 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 709 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:709: unrecognized date search context enumeration v" \
 "alue");
-#line 4726 "SearchBoolean.c"
+#line 4723 "SearchBoolean.c"
 		}
 	}
 }
 
 
-SearchConditionDateContext search_condition_date_context_from_string (const gchar* str) {
+SearchConditionDateContext
+search_condition_date_context_from_string (const gchar* str)
+{
 	SearchConditionDateContext result = 0;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
 #line 713 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (str != NULL, 0);
 #line 714 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = str;
-#line 714 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp0_, "EXACT") == 0) {
+	if (g_strcmp0 (str, "EXACT") == 0) {
 #line 715 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_DATE_CONTEXT_EXACT;
 #line 715 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4746 "SearchBoolean.c"
+#line 4741 "SearchBoolean.c"
 	}
 #line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = str;
-#line 717 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (g_strcmp0 (_tmp1_, "AFTER") == 0) {
+	if (g_strcmp0 (str, "AFTER") == 0) {
 #line 718 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = SEARCH_CONDITION_DATE_CONTEXT_AFTER;
 #line 718 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4756 "SearchBoolean.c"
+#line 4749 "SearchBoolean.c"
 	} else {
-		const gchar* _tmp2_;
 #line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp2_ = str;
-#line 720 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		if (g_strcmp0 (_tmp2_, "BEFORE") == 0) {
+		if (g_strcmp0 (str, "BEFORE") == 0) {
 #line 721 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = SEARCH_CONDITION_DATE_CONTEXT_BEFORE;
 #line 721 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4767 "SearchBoolean.c"
+#line 4757 "SearchBoolean.c"
 		} else {
-			const gchar* _tmp3_;
-#line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp3_ = str;
 #line 723 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (g_strcmp0 (_tmp3_, "BETWEEN") == 0) {
+			if (g_strcmp0 (str, "BETWEEN") == 0) {
 #line 724 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				result = SEARCH_CONDITION_DATE_CONTEXT_BETWEEN;
 #line 724 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				return result;
-#line 4778 "SearchBoolean.c"
+#line 4765 "SearchBoolean.c"
 			} else {
-				const gchar* _tmp4_;
 #line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp4_ = str;
-#line 726 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				if (g_strcmp0 (_tmp4_, "IS_NOT_SET") == 0) {
+				if (g_strcmp0 (str, "IS_NOT_SET") == 0) {
 #line 727 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					result = SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET;
 #line 727 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 4789 "SearchBoolean.c"
+#line 4773 "SearchBoolean.c"
 				} else {
-					const gchar* _tmp5_;
-#line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp5_ = str;
 #line 730 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					g_error ("SearchBoolean.vala:730: unrecognized date search context name: %s", _tmp5_);
-#line 4796 "SearchBoolean.c"
+					g_error ("SearchBoolean.vala:730: unrecognized date search context name: %s", str);
+#line 4777 "SearchBoolean.c"
 				}
 			}
 		}
@@ -4809,7 +4790,9 @@ SearchConditionDateContext search_condition_date_context_from_string (const gcha
 }
 
 
-GType search_condition_date_context_get_type (void) {
+GType
+search_condition_date_context_get_type (void)
+{
 	static volatile gsize search_condition_date_context_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_date_context_type_id__volatile)) {
 		static const GEnumValue values[] = {{SEARCH_CONDITION_DATE_CONTEXT_EXACT, "SEARCH_CONDITION_DATE_CONTEXT_EXACT", "exact"}, {SEARCH_CONDITION_DATE_CONTEXT_AFTER, "SEARCH_CONDITION_DATE_CONTEXT_AFTER", "after"}, {SEARCH_CONDITION_DATE_CONTEXT_BEFORE, "SEARCH_CONDITION_DATE_CONTEXT_BEFORE", "before"}, {SEARCH_CONDITION_DATE_CONTEXT_BETWEEN, "SEARCH_CONDITION_DATE_CONTEXT_BETWEEN", "between"}, {SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET, "SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET", "is-not-set"}, {0, NULL, NULL}};
@@ -4821,12 +4804,15 @@ GType search_condition_date_context_get_type (void) {
 }
 
 
-SearchConditionDate* search_condition_date_construct (GType object_type, SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) {
+SearchConditionDate*
+search_condition_date_construct (GType object_type,
+                                 SearchConditionSearchType search_type,
+                                 SearchConditionDateContext context,
+                                 GDateTime* date_one,
+                                 GDateTime* date_two)
+{
 	SearchConditionDate* self = NULL;
-	SearchConditionSearchType _tmp0_;
-	SearchConditionDateContext _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	SearchConditionDateContext _tmp3_;
+	gboolean _tmp0_ = FALSE;
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (date_one != NULL, NULL);
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -4834,270 +4820,226 @@ SearchConditionDate* search_condition_date_construct (GType object_type, SearchC
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SearchConditionDate*) search_condition_construct (object_type);
 #line 743 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = search_type;
-#line 743 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), _tmp0_);
+	search_condition_set_search_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_CONDITION, SearchCondition), search_type);
 #line 744 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = context;
-#line 744 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	search_condition_date_set_context (self, _tmp1_);
-#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp3_ = context;
+	search_condition_date_set_context (self, context);
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp3_ != SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
+	if (context != SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp2_ = TRUE;
-#line 4842 "SearchBoolean.c"
+		_tmp0_ = TRUE;
+#line 4822 "SearchBoolean.c"
 	} else {
-		GDateTime* _tmp4_;
-		GDateTime* _tmp5_;
-		gint _tmp6_;
-#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp4_ = date_two;
-#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp5_ = date_one;
-#line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp6_ = g_date_time_compare (_tmp4_, _tmp5_);
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp2_ = _tmp6_ >= 1;
-#line 4855 "SearchBoolean.c"
+		_tmp0_ = g_date_time_compare (date_two, date_one) >= 1;
+#line 4826 "SearchBoolean.c"
 	}
 #line 745 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp2_) {
-#line 4859 "SearchBoolean.c"
-		GDateTime* _tmp7_;
-		GDateTime* _tmp8_;
-#line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp7_ = date_one;
+	if (_tmp0_) {
 #line 746 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		search_condition_date_set_date_one (self, _tmp7_);
-#line 747 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp8_ = date_two;
+		search_condition_date_set_date_one (self, date_one);
 #line 747 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		search_condition_date_set_date_two (self, _tmp8_);
-#line 4870 "SearchBoolean.c"
+		search_condition_date_set_date_two (self, date_two);
+#line 4834 "SearchBoolean.c"
 	} else {
-		GDateTime* _tmp9_;
-		GDateTime* _tmp10_;
 #line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp9_ = date_two;
-#line 749 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		search_condition_date_set_date_one (self, _tmp9_);
-#line 750 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp10_ = date_one;
+		search_condition_date_set_date_one (self, date_two);
 #line 750 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		search_condition_date_set_date_two (self, _tmp10_);
-#line 4882 "SearchBoolean.c"
+		search_condition_date_set_date_two (self, date_one);
+#line 4840 "SearchBoolean.c"
 	}
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 4886 "SearchBoolean.c"
+#line 4844 "SearchBoolean.c"
 }
 
 
-SearchConditionDate* search_condition_date_new (SearchConditionSearchType search_type, SearchConditionDateContext context, GDateTime* date_one, GDateTime* date_two) {
+SearchConditionDate*
+search_condition_date_new (SearchConditionSearchType search_type,
+                           SearchConditionDateContext context,
+                           GDateTime* date_one,
+                           GDateTime* date_two)
+{
 #line 741 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return search_condition_date_construct (TYPE_SEARCH_CONDITION_DATE, search_type, context, date_one, date_two);
-#line 4893 "SearchBoolean.c"
+#line 4856 "SearchBoolean.c"
 }
 
 
-static gboolean search_condition_date_real_predicate (SearchCondition* base, MediaSource* source) {
+static gboolean
+search_condition_date_real_predicate (SearchCondition* base,
+                                      MediaSource* source)
+{
 	SearchConditionDate * self;
 	gboolean result = FALSE;
 	time_t exposure_time = 0;
-	MediaSource* _tmp0_;
-	time_t _tmp1_;
-	time_t _tmp2_;
+	time_t _tmp0_;
 	GDateTime* dt = NULL;
-	time_t _tmp4_;
-	GDateTime* _tmp5_;
-	SearchConditionDateContext _tmp6_;
+	time_t _tmp2_;
+	GDateTime* _tmp3_;
+	SearchConditionDateContext _tmp4_;
 #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate);
 #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), FALSE);
 #line 757 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = source;
-#line 757 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = media_source_get_exposure_time (_tmp0_);
-#line 757 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	exposure_time = _tmp1_;
+	exposure_time = media_source_get_exposure_time (source);
 #line 758 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = exposure_time;
+	_tmp0_ = exposure_time;
 #line 758 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp2_ == ((time_t) 0)) {
-#line 4922 "SearchBoolean.c"
-		SearchConditionDateContext _tmp3_;
+	if (_tmp0_ == ((time_t) 0)) {
+#line 4882 "SearchBoolean.c"
+		SearchConditionDateContext _tmp1_;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp3_ = self->priv->_context;
+		_tmp1_ = self->priv->_context;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		result = _tmp3_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET;
+		result = _tmp1_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET;
 #line 759 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 4930 "SearchBoolean.c"
+#line 4890 "SearchBoolean.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp4_ = exposure_time;
+	_tmp2_ = exposure_time;
 #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp5_ = g_date_time_new_from_unix_local ((gint64) _tmp4_);
+	_tmp3_ = g_date_time_new_from_unix_local ((gint64) _tmp2_);
 #line 761 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	dt = _tmp5_;
+	dt = _tmp3_;
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp6_ = self->priv->_context;
+	_tmp4_ = self->priv->_context;
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	switch (_tmp6_) {
+	switch (_tmp4_) {
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_EXACT:
-#line 4944 "SearchBoolean.c"
+#line 4904 "SearchBoolean.c"
 		{
 			GDateTime* second = NULL;
-			GDateTime* _tmp7_;
+			GDateTime* _tmp5_;
+			GDateTime* _tmp6_;
+			gboolean _tmp7_ = FALSE;
 			GDateTime* _tmp8_;
-			gboolean _tmp9_ = FALSE;
-			GDateTime* _tmp10_;
-			GDateTime* _tmp11_;
-			gint _tmp12_;
+			GDateTime* _tmp9_;
 #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp7_ = self->priv->_date_one;
+			_tmp5_ = self->priv->_date_one;
 #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp8_ = g_date_time_add_days (_tmp7_, 1);
+			_tmp6_ = g_date_time_add_days (_tmp5_, 1);
 #line 764 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			second = _tmp8_;
-#line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp10_ = dt;
+			second = _tmp6_;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp11_ = self->priv->_date_one;
+			_tmp8_ = dt;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp12_ = g_date_time_compare (_tmp10_, _tmp11_);
+			_tmp9_ = self->priv->_date_one;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (_tmp12_ >= 0) {
-#line 4967 "SearchBoolean.c"
-				GDateTime* _tmp13_;
-				GDateTime* _tmp14_;
-				gint _tmp15_;
+			if (g_date_time_compare (_tmp8_, _tmp9_) >= 0) {
+#line 4924 "SearchBoolean.c"
+				GDateTime* _tmp10_;
+				GDateTime* _tmp11_;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp13_ = dt;
+				_tmp10_ = dt;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp14_ = second;
+				_tmp11_ = second;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp15_ = g_date_time_compare (_tmp13_, _tmp14_);
-#line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp9_ = _tmp15_ < 0;
-#line 4979 "SearchBoolean.c"
+				_tmp7_ = g_date_time_compare (_tmp10_, _tmp11_) < 0;
+#line 4933 "SearchBoolean.c"
 			} else {
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp9_ = FALSE;
-#line 4983 "SearchBoolean.c"
+				_tmp7_ = FALSE;
+#line 4937 "SearchBoolean.c"
 			}
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp9_;
+			result = _tmp7_;
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_date_time_unref0 (second);
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_date_time_unref0 (dt);
 #line 765 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 4993 "SearchBoolean.c"
+#line 4947 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_AFTER:
-#line 4997 "SearchBoolean.c"
+#line 4951 "SearchBoolean.c"
 		{
-			GDateTime* _tmp16_;
-			GDateTime* _tmp17_;
-			gint _tmp18_;
+			GDateTime* _tmp12_;
+			GDateTime* _tmp13_;
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp16_ = dt;
+			_tmp12_ = dt;
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp17_ = self->priv->_date_one;
+			_tmp13_ = self->priv->_date_one;
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp18_ = g_date_time_compare (_tmp16_, _tmp17_);
-#line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp18_ >= 0;
+			result = g_date_time_compare (_tmp12_, _tmp13_) >= 0;
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_date_time_unref0 (dt);
 #line 768 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5014 "SearchBoolean.c"
+#line 4965 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BEFORE:
-#line 5018 "SearchBoolean.c"
+#line 4969 "SearchBoolean.c"
 		{
-			GDateTime* _tmp19_;
-			GDateTime* _tmp20_;
-			gint _tmp21_;
+			GDateTime* _tmp14_;
+			GDateTime* _tmp15_;
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp19_ = dt;
+			_tmp14_ = dt;
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp20_ = self->priv->_date_one;
-#line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp21_ = g_date_time_compare (_tmp19_, _tmp20_);
+			_tmp15_ = self->priv->_date_one;
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp21_ <= 0;
+			result = g_date_time_compare (_tmp14_, _tmp15_) <= 0;
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_date_time_unref0 (dt);
 #line 771 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5035 "SearchBoolean.c"
+#line 4983 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_BETWEEN:
-#line 5039 "SearchBoolean.c"
+#line 4987 "SearchBoolean.c"
 		{
 			GDateTime* second = NULL;
-			GDateTime* _tmp22_;
-			GDateTime* _tmp23_;
-			gboolean _tmp24_ = FALSE;
-			GDateTime* _tmp25_;
-			GDateTime* _tmp26_;
-			gint _tmp27_;
+			GDateTime* _tmp16_;
+			GDateTime* _tmp17_;
+			gboolean _tmp18_ = FALSE;
+			GDateTime* _tmp19_;
+			GDateTime* _tmp20_;
 #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp22_ = self->priv->_date_two;
+			_tmp16_ = self->priv->_date_two;
 #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp23_ = g_date_time_add_days (_tmp22_, 1);
+			_tmp17_ = g_date_time_add_days (_tmp16_, 1);
 #line 774 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			second = _tmp23_;
-#line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp25_ = dt;
+			second = _tmp17_;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp26_ = self->priv->_date_one;
-#line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			_tmp27_ = g_date_time_compare (_tmp25_, _tmp26_);
+			_tmp19_ = dt;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			if (_tmp27_ >= 0) {
-#line 5062 "SearchBoolean.c"
-				GDateTime* _tmp28_;
-				GDateTime* _tmp29_;
-				gint _tmp30_;
+			_tmp20_ = self->priv->_date_one;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp28_ = dt;
+			if (g_date_time_compare (_tmp19_, _tmp20_) >= 0) {
+#line 5007 "SearchBoolean.c"
+				GDateTime* _tmp21_;
+				GDateTime* _tmp22_;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp29_ = second;
+				_tmp21_ = dt;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp30_ = g_date_time_compare (_tmp28_, _tmp29_);
+				_tmp22_ = second;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp24_ = _tmp30_ < 0;
-#line 5074 "SearchBoolean.c"
+				_tmp18_ = g_date_time_compare (_tmp21_, _tmp22_) < 0;
+#line 5016 "SearchBoolean.c"
 			} else {
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp24_ = FALSE;
-#line 5078 "SearchBoolean.c"
+				_tmp18_ = FALSE;
+#line 5020 "SearchBoolean.c"
 			}
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			result = _tmp24_;
+			result = _tmp18_;
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_date_time_unref0 (second);
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_date_time_unref0 (dt);
 #line 775 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5088 "SearchBoolean.c"
+#line 5030 "SearchBoolean.c"
 		}
 #line 762 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		case SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET:
-#line 5092 "SearchBoolean.c"
+#line 5034 "SearchBoolean.c"
 		{
 #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			result = FALSE;
@@ -5105,23 +5047,25 @@ static gboolean search_condition_date_real_predicate (SearchCondition* base, Med
 			_g_date_time_unref0 (dt);
 #line 778 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return result;
-#line 5100 "SearchBoolean.c"
+#line 5042 "SearchBoolean.c"
 		}
 		default:
 		{
 #line 781 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_error ("SearchBoolean.vala:781: unrecognized date search context enumeration v" \
 "alue");
-#line 5106 "SearchBoolean.c"
+#line 5048 "SearchBoolean.c"
 		}
 	}
 #line 756 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_date_time_unref0 (dt);
-#line 5111 "SearchBoolean.c"
+#line 5053 "SearchBoolean.c"
 }
 
 
-GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) {
+GDateTime*
+search_condition_date_get_date_one (SearchConditionDate* self)
+{
 	GDateTime* result;
 	GDateTime* _tmp0_;
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5132,35 +5076,39 @@ GDateTime* search_condition_date_get_date_one (SearchConditionDate* self) {
 	result = _tmp0_;
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5126 "SearchBoolean.c"
+#line 5070 "SearchBoolean.c"
 }
 
 
-static gpointer _g_date_time_ref0 (gpointer self) {
+static gpointer
+_g_date_time_ref0 (gpointer self)
+{
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? g_date_time_ref (self) : NULL;
-#line 5133 "SearchBoolean.c"
+#line 5079 "SearchBoolean.c"
 }
 
 
-static void search_condition_date_set_date_one (SearchConditionDate* self, GDateTime* value) {
+static void
+search_condition_date_set_date_one (SearchConditionDate* self,
+                                    GDateTime* value)
+{
 	GDateTime* _tmp0_;
-	GDateTime* _tmp1_;
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_DATE (self));
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = _g_date_time_ref0 (_tmp0_);
+	_tmp0_ = _g_date_time_ref0 (value);
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_date_time_unref0 (self->priv->_date_one);
 #line 735 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_date_one = _tmp1_;
-#line 5150 "SearchBoolean.c"
+	self->priv->_date_one = _tmp0_;
+#line 5096 "SearchBoolean.c"
 }
 
 
-GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) {
+GDateTime*
+search_condition_date_get_date_two (SearchConditionDate* self)
+{
 	GDateTime* result;
 	GDateTime* _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5171,28 +5119,30 @@ GDateTime* search_condition_date_get_date_two (SearchConditionDate* self) {
 	result = _tmp0_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5165 "SearchBoolean.c"
+#line 5113 "SearchBoolean.c"
 }
 
 
-static void search_condition_date_set_date_two (SearchConditionDate* self, GDateTime* value) {
+static void
+search_condition_date_set_date_two (SearchConditionDate* self,
+                                    GDateTime* value)
+{
 	GDateTime* _tmp0_;
-	GDateTime* _tmp1_;
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_DATE (self));
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = _g_date_time_ref0 (_tmp0_);
+	_tmp0_ = _g_date_time_ref0 (value);
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_date_time_unref0 (self->priv->_date_two);
 #line 736 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_date_two = _tmp1_;
-#line 5182 "SearchBoolean.c"
+	self->priv->_date_two = _tmp0_;
+#line 5130 "SearchBoolean.c"
 }
 
 
-SearchConditionDateContext search_condition_date_get_context (SearchConditionDate* self) {
+SearchConditionDateContext
+search_condition_date_get_context (SearchConditionDate* self)
+{
 	SearchConditionDateContext result;
 	SearchConditionDateContext _tmp0_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5203,23 +5153,25 @@ SearchConditionDateContext search_condition_date_get_context (SearchConditionDat
 	result = _tmp0_;
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5197 "SearchBoolean.c"
+#line 5147 "SearchBoolean.c"
 }
 
 
-static void search_condition_date_set_context (SearchConditionDate* self, SearchConditionDateContext value) {
-	SearchConditionDateContext _tmp0_;
+static void
+search_condition_date_set_context (SearchConditionDate* self,
+                                   SearchConditionDateContext value)
+{
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION_DATE (self));
 #line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = value;
-#line 739 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->_context = _tmp0_;
-#line 5209 "SearchBoolean.c"
+	self->priv->_context = value;
+#line 5159 "SearchBoolean.c"
 }
 
 
-static void search_condition_date_class_init (SearchConditionDateClass * klass) {
+static void
+search_condition_date_class_init (SearchConditionDateClass * klass)
+{
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search_condition_date_parent_class = g_type_class_peek_parent (klass);
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5228,18 +5180,22 @@ static void search_condition_date_class_init (SearchConditionDateClass * klass)
 	g_type_class_add_private (klass, sizeof (SearchConditionDatePrivate));
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	((SearchConditionClass *) klass)->predicate = (gboolean (*) (SearchCondition *, MediaSource*)) search_condition_date_real_predicate;
-#line 5222 "SearchBoolean.c"
+#line 5174 "SearchBoolean.c"
 }
 
 
-static void search_condition_date_instance_init (SearchConditionDate * self) {
+static void
+search_condition_date_instance_init (SearchConditionDate * self)
+{
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SEARCH_CONDITION_DATE_GET_PRIVATE (self);
-#line 5229 "SearchBoolean.c"
+#line 5183 "SearchBoolean.c"
 }
 
 
-static void search_condition_date_finalize (SearchCondition * obj) {
+static void
+search_condition_date_finalize (SearchCondition * obj)
+{
 	SearchConditionDate * self;
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_CONDITION_DATE, SearchConditionDate);
@@ -5249,11 +5205,13 @@ static void search_condition_date_finalize (SearchCondition * obj) {
 	_g_date_time_unref0 (self->priv->_date_two);
 #line 683 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	SEARCH_CONDITION_CLASS (search_condition_date_parent_class)->finalize (obj);
-#line 5243 "SearchBoolean.c"
+#line 5199 "SearchBoolean.c"
 }
 
 
-GType search_condition_date_get_type (void) {
+GType
+search_condition_date_get_type (void)
+{
 	static volatile gsize search_condition_date_type_id__volatile = 0;
 	if (g_once_init_enter (&search_condition_date_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchConditionDateClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) search_condition_date_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchConditionDate), 0, (GInstanceInitFunc) search_condition_date_instance_init, NULL };
@@ -5265,46 +5223,51 @@ GType search_condition_date_get_type (void) {
 }
 
 
-static gpointer _saved_search_row_ref0 (gpointer self) {
+static gpointer
+_saved_search_row_ref0 (gpointer self)
+{
 #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? saved_search_row_ref (self) : NULL;
-#line 5262 "SearchBoolean.c"
+#line 5222 "SearchBoolean.c"
 }
 
 
-SavedSearch* saved_search_construct (GType object_type, SavedSearchRow* row, gint64 object_id) {
+SavedSearch*
+saved_search_construct (GType object_type,
+                        SavedSearchRow* row,
+                        gint64 object_id)
+{
 	SavedSearch * self = NULL;
-	gint64 _tmp0_;
-	SavedSearchRow* _tmp1_;
-	SavedSearchRow* _tmp2_;
+	SavedSearchRow* _tmp0_;
 #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_ROW (row), NULL);
 #line 795 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = object_id;
-#line 795 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self = (SavedSearch*) data_source_construct (object_type, _tmp0_);
-#line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = row;
+	self = (SavedSearch*) data_source_construct (object_type, object_id);
 #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = _saved_search_row_ref0 (_tmp1_);
+	_tmp0_ = _saved_search_row_ref0 (row);
 #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_saved_search_row_unref0 (self->priv->row);
 #line 797 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	self->priv->row = _tmp2_;
+	self->priv->row = _tmp0_;
 #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 5287 "SearchBoolean.c"
+#line 5245 "SearchBoolean.c"
 }
 
 
-SavedSearch* saved_search_new (SavedSearchRow* row, gint64 object_id) {
+SavedSearch*
+saved_search_new (SavedSearchRow* row,
+                  gint64 object_id)
+{
 #line 794 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return saved_search_construct (TYPE_SAVED_SEARCH, row, object_id);
-#line 5294 "SearchBoolean.c"
+#line 5255 "SearchBoolean.c"
 }
 
 
-static gchar* saved_search_real_get_name (DataObject* base) {
+static gchar*
+saved_search_real_get_name (DataObject* base)
+{
 	SavedSearch * self;
 	gchar* result = NULL;
 	SavedSearchRow* _tmp0_;
@@ -5322,11 +5285,13 @@ static gchar* saved_search_real_get_name (DataObject* base) {
 	result = _tmp2_;
 #line 801 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5316 "SearchBoolean.c"
+#line 5279 "SearchBoolean.c"
 }
 
 
-static gchar* saved_search_real_to_string (DataObject* base) {
+static gchar*
+saved_search_real_to_string (DataObject* base)
+{
 	SavedSearch * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -5349,11 +5314,13 @@ static gchar* saved_search_real_to_string (DataObject* base) {
 	result = _tmp3_;
 #line 805 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5343 "SearchBoolean.c"
+#line 5308 "SearchBoolean.c"
 }
 
 
-static gchar* saved_search_real_get_typename (DataSource* base) {
+static gchar*
+saved_search_real_get_typename (DataSource* base)
+{
 	SavedSearch * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -5365,11 +5332,14 @@ static gchar* saved_search_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 809 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5359 "SearchBoolean.c"
+#line 5326 "SearchBoolean.c"
 }
 
 
-void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result) {
+void
+saved_search_get_saved_search_id (SavedSearch* self,
+                                  SavedSearchID* result)
+{
 	SavedSearchRow* _tmp0_;
 	SavedSearchID _tmp1_;
 #line 812 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5382,11 +5352,13 @@ void saved_search_get_saved_search_id (SavedSearch* self, SavedSearchID* result)
 	*result = _tmp1_;
 #line 813 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return;
-#line 5376 "SearchBoolean.c"
+#line 5346 "SearchBoolean.c"
 }
 
 
-static gint64 saved_search_real_get_instance_id (DataSource* base) {
+static gint64
+saved_search_real_get_instance_id (DataSource* base)
+{
 	SavedSearch * self;
 	gint64 result = 0LL;
 	SavedSearchID _tmp0_ = {0};
@@ -5401,42 +5373,39 @@ static gint64 saved_search_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 817 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5395 "SearchBoolean.c"
+#line 5367 "SearchBoolean.c"
 }
 
 
-gint saved_search_compare_names (void* a, void* b) {
+gint
+saved_search_compare_names (void* a,
+                            void* b)
+{
 	gint result = 0;
 	SavedSearch* asearch = NULL;
-	void* _tmp0_;
 	SavedSearch* bsearch = NULL;
-	void* _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-	gint _tmp4_;
-#line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = a;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 821 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	asearch = (SavedSearch*) _tmp0_;
-#line 822 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = b;
+	asearch = (SavedSearch*) a;
 #line 822 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	bsearch = (SavedSearch*) _tmp1_;
+	bsearch = (SavedSearch*) b;
 #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (asearch, TYPE_DATA_OBJECT, DataObject));
+	_tmp0_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (asearch, TYPE_DATA_OBJECT, DataObject));
 #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp3_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (bsearch, TYPE_DATA_OBJECT, DataObject));
+	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (bsearch, TYPE_DATA_OBJECT, DataObject));
 #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp4_ = string_collated_compare (_tmp2_, _tmp3_);
-#line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	result = _tmp4_;
+	result = string_collated_compare (_tmp0_, _tmp1_);
 #line 824 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5426 "SearchBoolean.c"
+#line 5392 "SearchBoolean.c"
 }
 
 
-gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
+gboolean
+saved_search_predicate (SavedSearch* self,
+                        MediaSource* source)
+{
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	gboolean _tmp0_ = FALSE;
@@ -5454,7 +5423,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 	if (SEARCH_OPERATOR_ALL == _tmp2_) {
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = TRUE;
-#line 5448 "SearchBoolean.c"
+#line 5417 "SearchBoolean.c"
 	} else {
 		SavedSearchRow* _tmp3_;
 		SearchOperator _tmp4_;
@@ -5464,17 +5433,17 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 		_tmp4_ = _tmp3_->operator;
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = SEARCH_OPERATOR_NONE == _tmp4_;
-#line 5458 "SearchBoolean.c"
+#line 5427 "SearchBoolean.c"
 	}
 #line 829 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_) {
 #line 830 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ret = TRUE;
-#line 5464 "SearchBoolean.c"
+#line 5433 "SearchBoolean.c"
 	} else {
 #line 832 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ret = FALSE;
-#line 5468 "SearchBoolean.c"
+#line 5437 "SearchBoolean.c"
 	}
 	{
 		GeeList* _c_list = NULL;
@@ -5506,7 +5475,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 		_c_index = -1;
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		while (TRUE) {
-#line 5500 "SearchBoolean.c"
+#line 5469 "SearchBoolean.c"
 			gint _tmp11_;
 			gint _tmp12_;
 			gint _tmp13_;
@@ -5528,7 +5497,7 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 			if (!(_tmp12_ < _tmp13_)) {
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				break;
-#line 5522 "SearchBoolean.c"
+#line 5491 "SearchBoolean.c"
 			}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp14_ = _c_list;
@@ -5544,92 +5513,76 @@ gboolean saved_search_predicate (SavedSearch* self, MediaSource* source) {
 			_tmp18_ = _tmp17_->operator;
 #line 835 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (SEARCH_OPERATOR_ALL == _tmp18_) {
-#line 5538 "SearchBoolean.c"
+#line 5507 "SearchBoolean.c"
 				gboolean _tmp19_;
 				SearchCondition* _tmp20_;
-				MediaSource* _tmp21_;
-				gboolean _tmp22_;
 #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp19_ = ret;
 #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp20_ = c;
 #line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp21_ = source;
-#line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp22_ = search_condition_predicate (_tmp20_, _tmp21_);
-#line 836 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				ret = _tmp19_ & _tmp22_;
-#line 5553 "SearchBoolean.c"
+				ret = _tmp19_ & search_condition_predicate (_tmp20_, source);
+#line 5516 "SearchBoolean.c"
 			} else {
-				SavedSearchRow* _tmp23_;
-				SearchOperator _tmp24_;
+				SavedSearchRow* _tmp21_;
+				SearchOperator _tmp22_;
 #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp23_ = self->priv->row;
+				_tmp21_ = self->priv->row;
 #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp24_ = _tmp23_->operator;
+				_tmp22_ = _tmp21_->operator;
 #line 837 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				if (SEARCH_OPERATOR_ANY == _tmp24_) {
-#line 5563 "SearchBoolean.c"
-					gboolean _tmp25_;
-					SearchCondition* _tmp26_;
-					MediaSource* _tmp27_;
-					gboolean _tmp28_;
-#line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp25_ = ret;
-#line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp26_ = c;
+				if (SEARCH_OPERATOR_ANY == _tmp22_) {
+#line 5526 "SearchBoolean.c"
+					gboolean _tmp23_;
+					SearchCondition* _tmp24_;
 #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp27_ = source;
+					_tmp23_ = ret;
 #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp28_ = search_condition_predicate (_tmp26_, _tmp27_);
+					_tmp24_ = c;
 #line 838 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					ret = _tmp25_ | _tmp28_;
-#line 5578 "SearchBoolean.c"
+					ret = _tmp23_ | search_condition_predicate (_tmp24_, source);
+#line 5535 "SearchBoolean.c"
 				} else {
-					SavedSearchRow* _tmp29_;
-					SearchOperator _tmp30_;
+					SavedSearchRow* _tmp25_;
+					SearchOperator _tmp26_;
 #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp29_ = self->priv->row;
+					_tmp25_ = self->priv->row;
 #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					_tmp30_ = _tmp29_->operator;
+					_tmp26_ = _tmp25_->operator;
 #line 839 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-					if (SEARCH_OPERATOR_NONE == _tmp30_) {
-#line 5588 "SearchBoolean.c"
-						gboolean _tmp31_;
-						SearchCondition* _tmp32_;
-						MediaSource* _tmp33_;
-						gboolean _tmp34_;
+					if (SEARCH_OPERATOR_NONE == _tmp26_) {
+#line 5545 "SearchBoolean.c"
+						gboolean _tmp27_;
+						SearchCondition* _tmp28_;
 #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						_tmp31_ = ret;
+						_tmp27_ = ret;
 #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						_tmp32_ = c;
+						_tmp28_ = c;
 #line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						_tmp33_ = source;
-#line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						_tmp34_ = search_condition_predicate (_tmp32_, _tmp33_);
-#line 840 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-						ret = _tmp31_ & (!_tmp34_);
-#line 5603 "SearchBoolean.c"
+						ret = _tmp27_ & (!search_condition_predicate (_tmp28_, source));
+#line 5554 "SearchBoolean.c"
 					}
 				}
 			}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_search_condition_unref0 (c);
-#line 5609 "SearchBoolean.c"
+#line 5560 "SearchBoolean.c"
 		}
 #line 834 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (_c_list);
-#line 5613 "SearchBoolean.c"
+#line 5564 "SearchBoolean.c"
 	}
 #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = ret;
 #line 842 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5619 "SearchBoolean.c"
+#line 5570 "SearchBoolean.c"
 }
 
 
-void saved_search_reconstitute (SavedSearch* self) {
+void
+saved_search_reconstitute (SavedSearch* self)
+{
 	SavedSearchTable* _tmp8_;
 	SavedSearchTable* _tmp9_;
 	gchar* _tmp10_;
@@ -5637,7 +5590,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 	GError * _inner_error_ = NULL;
 #line 845 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (self));
-#line 5631 "SearchBoolean.c"
+#line 5584 "SearchBoolean.c"
 	{
 		SavedSearchID _tmp0_ = {0};
 		SavedSearchDBTable* _tmp1_;
@@ -5664,7 +5617,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5658 "SearchBoolean.c"
+#line 5611 "SearchBoolean.c"
 				goto __catch86_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5673,13 +5626,13 @@ void saved_search_reconstitute (SavedSearch* self) {
 			g_clear_error (&_inner_error_);
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return;
-#line 5667 "SearchBoolean.c"
+#line 5620 "SearchBoolean.c"
 		}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp6_ = self->priv->row;
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp6_->search_id = _tmp0_;
-#line 5673 "SearchBoolean.c"
+#line 5626 "SearchBoolean.c"
 	}
 	goto __finally86;
 	__catch86_database_error:
@@ -5696,7 +5649,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		app_window_database_error (_tmp7_);
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 5690 "SearchBoolean.c"
+#line 5643 "SearchBoolean.c"
 	}
 	__finally86:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5707,7 +5660,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		g_clear_error (&_inner_error_);
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return;
-#line 5701 "SearchBoolean.c"
+#line 5654 "SearchBoolean.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp8_ = saved_search_table_get_instance ();
@@ -5725,92 +5678,79 @@ void saved_search_reconstitute (SavedSearch* self) {
 	g_debug ("SearchBoolean.vala:853: Reconstituted %s", _tmp11_);
 #line 853 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_free0 (_tmp11_);
-#line 5719 "SearchBoolean.c"
+#line 5672 "SearchBoolean.c"
 }
 
 
-gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
+gboolean
+saved_search_rename (SavedSearch* self,
+                     const gchar* new_name)
+{
 	gboolean result = FALSE;
-	const gchar* _tmp0_;
-	gboolean _tmp1_;
-	SavedSearchTable* _tmp2_;
-	SavedSearchTable* _tmp3_;
-	const gchar* _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
+	SavedSearchTable* _tmp0_;
+	SavedSearchTable* _tmp1_;
+	gboolean _tmp2_;
+	SavedSearchTable* _tmp10_;
+	SavedSearchTable* _tmp11_;
+	SavedSearchRow* _tmp12_;
+	gchar* _tmp13_;
+	SavedSearchTable* _tmp14_;
 	SavedSearchTable* _tmp15_;
-	SavedSearchTable* _tmp16_;
-	SavedSearchRow* _tmp17_;
-	const gchar* _tmp18_;
-	gchar* _tmp19_;
-	SavedSearchTable* _tmp20_;
-	SavedSearchTable* _tmp21_;
-	LibraryWindow* _tmp22_;
-	LibraryWindow* _tmp23_;
+	LibraryWindow* _tmp16_;
+	LibraryWindow* _tmp17_;
 	GError * _inner_error_ = NULL;
 #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (self), FALSE);
 #line 857 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (new_name != NULL, FALSE);
 #line 858 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp0_ = new_name;
-#line 858 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = is_string_empty (_tmp0_);
-#line 858 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp1_) {
+	if (is_string_empty (new_name)) {
 #line 859 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = FALSE;
 #line 859 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 5756 "SearchBoolean.c"
+#line 5703 "SearchBoolean.c"
 	}
 #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = saved_search_table_get_instance ();
+	_tmp0_ = saved_search_table_get_instance ();
 #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp3_ = _tmp2_;
-#line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp4_ = new_name;
-#line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp5_ = saved_search_table_exists (_tmp3_, _tmp4_);
+	_tmp1_ = _tmp0_;
 #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp6_ = _tmp5_;
+	_tmp2_ = saved_search_table_exists (_tmp1_, new_name);
 #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_saved_search_table_unref0 (_tmp3_);
+	_saved_search_table_unref0 (_tmp1_);
 #line 861 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	if (_tmp6_) {
+	if (_tmp2_) {
 #line 862 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = FALSE;
 #line 862 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 5776 "SearchBoolean.c"
+#line 5719 "SearchBoolean.c"
 	}
 	{
-		SavedSearchDBTable* _tmp7_;
-		SavedSearchDBTable* _tmp8_;
-		SavedSearchRow* _tmp9_;
-		SavedSearchID _tmp10_;
-		const gchar* _tmp11_;
-#line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp7_ = saved_search_db_table_get_instance ();
+		SavedSearchDBTable* _tmp3_;
+		SavedSearchDBTable* _tmp4_;
+		SavedSearchRow* _tmp5_;
+		SavedSearchID _tmp6_;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp8_ = _tmp7_;
+		_tmp3_ = saved_search_db_table_get_instance ();
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp9_ = self->priv->row;
+		_tmp4_ = _tmp3_;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp10_ = _tmp9_->search_id;
+		_tmp5_ = self->priv->row;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp11_ = new_name;
+		_tmp6_ = _tmp5_->search_id;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		saved_search_db_table_rename (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
+		saved_search_db_table_rename (_tmp4_, &_tmp6_, new_name, &_inner_error_);
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_database_table_unref0 (_tmp8_);
+		_database_table_unref0 (_tmp4_);
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5800 "SearchBoolean.c"
-			gboolean _tmp12_ = FALSE;
+#line 5740 "SearchBoolean.c"
+			gboolean _tmp7_ = FALSE;
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5804 "SearchBoolean.c"
+#line 5744 "SearchBoolean.c"
 				goto __catch87_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5818,87 +5758,87 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_clear_error (&_inner_error_);
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-			return _tmp12_;
-#line 5813 "SearchBoolean.c"
+			return _tmp7_;
+#line 5753 "SearchBoolean.c"
 		}
 	}
 	goto __finally87;
 	__catch87_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp13_;
+		GError* _tmp8_;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_inner_error_ = NULL;
 #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp13_ = err;
+		_tmp8_ = err;
 #line 867 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		app_window_database_error (_tmp13_);
+		app_window_database_error (_tmp8_);
 #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		result = FALSE;
 #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
 #line 868 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return result;
-#line 5835 "SearchBoolean.c"
+#line 5775 "SearchBoolean.c"
 	}
 	__finally87:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5840 "SearchBoolean.c"
-		gboolean _tmp14_ = FALSE;
+#line 5780 "SearchBoolean.c"
+		gboolean _tmp9_ = FALSE;
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_clear_error (&_inner_error_);
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		return _tmp14_;
-#line 5848 "SearchBoolean.c"
+		return _tmp9_;
+#line 5788 "SearchBoolean.c"
 	}
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp15_ = saved_search_table_get_instance ();
+	_tmp10_ = saved_search_table_get_instance ();
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp16_ = _tmp15_;
+	_tmp11_ = _tmp10_;
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	saved_search_table_remove_from_map (_tmp16_, self);
+	saved_search_table_remove_from_map (_tmp11_, self);
 #line 871 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_saved_search_table_unref0 (_tmp16_);
+	_saved_search_table_unref0 (_tmp11_);
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp17_ = self->priv->row;
+	_tmp12_ = self->priv->row;
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp18_ = new_name;
+	_tmp13_ = g_strdup (new_name);
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp19_ = g_strdup (_tmp18_);
+	_g_free0 (_tmp12_->name);
 #line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_free0 (_tmp17_->name);
-#line 872 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp17_->name = _tmp19_;
+	_tmp12_->name = _tmp13_;
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp20_ = saved_search_table_get_instance ();
+	_tmp14_ = saved_search_table_get_instance ();
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp21_ = _tmp20_;
+	_tmp15_ = _tmp14_;
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	saved_search_table_add_to_map (_tmp21_, self);
+	saved_search_table_add_to_map (_tmp15_, self);
 #line 873 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_saved_search_table_unref0 (_tmp21_);
+	_saved_search_table_unref0 (_tmp15_);
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp22_ = library_window_get_app ();
+	_tmp16_ = library_window_get_app ();
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp23_ = _tmp22_;
+	_tmp17_ = _tmp16_;
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	library_window_switch_to_saved_search (_tmp23_, self);
+	library_window_switch_to_saved_search (_tmp17_, self);
 #line 875 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_object_unref0 (_tmp23_);
+	_g_object_unref0 (_tmp17_);
 #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = TRUE;
 #line 876 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5888 "SearchBoolean.c"
+#line 5826 "SearchBoolean.c"
 }
 
 
-GeeList* saved_search_get_conditions (SavedSearch* self) {
+GeeList*
+saved_search_get_conditions (SavedSearch* self)
+{
 	GeeList* result = NULL;
 	SavedSearchRow* _tmp0_;
 	GeeList* _tmp1_;
@@ -5918,11 +5858,13 @@ GeeList* saved_search_get_conditions (SavedSearch* self) {
 	result = _tmp3_;
 #line 880 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5912 "SearchBoolean.c"
+#line 5852 "SearchBoolean.c"
 }
 
 
-SearchOperator saved_search_get_operator (SavedSearch* self) {
+SearchOperator
+saved_search_get_operator (SavedSearch* self)
+{
 	SearchOperator result = 0;
 	SavedSearchRow* _tmp0_;
 	SearchOperator _tmp1_;
@@ -5936,11 +5878,13 @@ SearchOperator saved_search_get_operator (SavedSearch* self) {
 	result = _tmp1_;
 #line 884 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 5930 "SearchBoolean.c"
+#line 5872 "SearchBoolean.c"
 }
 
 
-static void saved_search_class_init (SavedSearchClass * klass) {
+static void
+saved_search_class_init (SavedSearchClass * klass)
+{
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	saved_search_parent_class = g_type_class_peek_parent (klass);
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5955,18 +5899,22 @@ static void saved_search_class_init (SavedSearchClass * klass) {
 	((DataSourceClass *) klass)->get_instance_id = (gint64 (*) (DataSource *)) saved_search_real_get_instance_id;
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	G_OBJECT_CLASS (klass)->finalize = saved_search_finalize;
-#line 5949 "SearchBoolean.c"
+#line 5893 "SearchBoolean.c"
 }
 
 
-static void saved_search_instance_init (SavedSearch * self) {
+static void
+saved_search_instance_init (SavedSearch * self)
+{
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SAVED_SEARCH_GET_PRIVATE (self);
-#line 5956 "SearchBoolean.c"
+#line 5902 "SearchBoolean.c"
 }
 
 
-static void saved_search_finalize (GObject * obj) {
+static void
+saved_search_finalize (GObject * obj)
+{
 	SavedSearch * self;
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH, SavedSearch);
@@ -5974,11 +5922,13 @@ static void saved_search_finalize (GObject * obj) {
 	_saved_search_row_unref0 (self->priv->row);
 #line 788 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	G_OBJECT_CLASS (saved_search_parent_class)->finalize (obj);
-#line 5968 "SearchBoolean.c"
+#line 5916 "SearchBoolean.c"
 }
 
 
-GType saved_search_get_type (void) {
+GType
+saved_search_get_type (void)
+{
 	static volatile gsize saved_search_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SavedSearchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) saved_search_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SavedSearch), 0, (GInstanceInitFunc) saved_search_instance_init, NULL };
@@ -5990,12 +5940,14 @@ GType saved_search_get_type (void) {
 }
 
 
-static SavedSearchTable* saved_search_table_construct (GType object_type) {
+static SavedSearchTable*
+saved_search_table_construct (GType object_type)
+{
 	SavedSearchTable* self = NULL;
 	GError * _inner_error_ = NULL;
 #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = (SavedSearchTable*) g_type_create_instance (object_type);
-#line 5989 "SearchBoolean.c"
+#line 5941 "SearchBoolean.c"
 	{
 		GeeList* _tmp0_ = NULL;
 		SavedSearchDBTable* _tmp1_;
@@ -6018,7 +5970,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6012 "SearchBoolean.c"
+#line 5964 "SearchBoolean.c"
 				goto __catch88_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6027,7 +5979,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 			g_clear_error (&_inner_error_);
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return NULL;
-#line 6021 "SearchBoolean.c"
+#line 5973 "SearchBoolean.c"
 		}
 		{
 			GeeList* _row_list = NULL;
@@ -6053,7 +6005,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 			_row_index = -1;
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			while (TRUE) {
-#line 6047 "SearchBoolean.c"
+#line 5999 "SearchBoolean.c"
 				gint _tmp9_;
 				gint _tmp10_;
 				gint _tmp11_;
@@ -6076,7 +6028,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 				if (!(_tmp10_ < _tmp11_)) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					break;
-#line 6070 "SearchBoolean.c"
+#line 6022 "SearchBoolean.c"
 				}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp12_ = _row_list;
@@ -6098,15 +6050,15 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 				_g_object_unref0 (_tmp17_);
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_saved_search_row_unref0 (row);
-#line 6092 "SearchBoolean.c"
+#line 6044 "SearchBoolean.c"
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (_row_list);
-#line 6096 "SearchBoolean.c"
+#line 6048 "SearchBoolean.c"
 		}
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (_tmp0_);
-#line 6100 "SearchBoolean.c"
+#line 6052 "SearchBoolean.c"
 	}
 	goto __finally88;
 	__catch88_database_error:
@@ -6123,7 +6075,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		app_window_database_error (_tmp18_);
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 6117 "SearchBoolean.c"
+#line 6069 "SearchBoolean.c"
 	}
 	__finally88:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6134,29 +6086,35 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		g_clear_error (&_inner_error_);
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return NULL;
-#line 6128 "SearchBoolean.c"
+#line 6080 "SearchBoolean.c"
 	}
 #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self;
-#line 6132 "SearchBoolean.c"
+#line 6084 "SearchBoolean.c"
 }
 
 
-static SavedSearchTable* saved_search_table_new (void) {
+static SavedSearchTable*
+saved_search_table_new (void)
+{
 #line 897 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return saved_search_table_construct (TYPE_SAVED_SEARCH_TABLE);
-#line 6139 "SearchBoolean.c"
+#line 6093 "SearchBoolean.c"
 }
 
 
-static gpointer _saved_search_table_ref0 (gpointer self) {
+static gpointer
+_saved_search_table_ref0 (gpointer self)
+{
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return self ? saved_search_table_ref (self) : NULL;
-#line 6146 "SearchBoolean.c"
+#line 6102 "SearchBoolean.c"
 }
 
 
-SavedSearchTable* saved_search_table_get_instance (void) {
+SavedSearchTable*
+saved_search_table_get_instance (void)
+{
 	SavedSearchTable* result = NULL;
 	SavedSearchTable* _tmp0_;
 	SavedSearchTable* _tmp2_;
@@ -6165,7 +6123,7 @@ SavedSearchTable* saved_search_table_get_instance (void) {
 	_tmp0_ = saved_search_table_instance;
 #line 909 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (_tmp0_ == NULL) {
-#line 6159 "SearchBoolean.c"
+#line 6117 "SearchBoolean.c"
 		SavedSearchTable* _tmp1_;
 #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = saved_search_table_new ();
@@ -6173,7 +6131,7 @@ SavedSearchTable* saved_search_table_get_instance (void) {
 		_saved_search_table_unref0 (saved_search_table_instance);
 #line 910 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_instance = _tmp1_;
-#line 6167 "SearchBoolean.c"
+#line 6125 "SearchBoolean.c"
 	}
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp2_ = saved_search_table_instance;
@@ -6183,11 +6141,13 @@ SavedSearchTable* saved_search_table_get_instance (void) {
 	result = _tmp3_;
 #line 912 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6177 "SearchBoolean.c"
+#line 6135 "SearchBoolean.c"
 }
 
 
-GeeCollection* saved_search_table_get_all (SavedSearchTable* self) {
+GeeCollection*
+saved_search_table_get_all (SavedSearchTable* self)
+{
 	GeeCollection* result = NULL;
 	GeeHashMap* _tmp0_;
 	GeeCollection* _tmp1_;
@@ -6204,17 +6164,22 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self) {
 	result = _tmp2_;
 #line 916 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6198 "SearchBoolean.c"
+#line 6158 "SearchBoolean.c"
 }
 
 
-SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* name, SearchOperator operator, GeeArrayList* conditions) {
+SavedSearch*
+saved_search_table_create (SavedSearchTable* self,
+                           const gchar* name,
+                           SearchOperator operator,
+                           GeeArrayList* conditions)
+{
 	SavedSearch* result = NULL;
 	SavedSearch* search = NULL;
+	SavedSearch* _tmp7_;
+	LibraryWindow* _tmp8_;
+	LibraryWindow* _tmp9_;
 	SavedSearch* _tmp10_;
-	LibraryWindow* _tmp11_;
-	LibraryWindow* _tmp12_;
-	SavedSearch* _tmp13_;
 	GError * _inner_error_ = NULL;
 #line 921 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL);
@@ -6224,40 +6189,31 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (conditions), NULL);
 #line 923 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	search = NULL;
-#line 6218 "SearchBoolean.c"
+#line 6183 "SearchBoolean.c"
 	{
 		SavedSearchRow* _tmp0_ = NULL;
 		SavedSearchDBTable* _tmp1_;
 		SavedSearchDBTable* _tmp2_;
-		const gchar* _tmp3_;
-		SearchOperator _tmp4_;
-		GeeArrayList* _tmp5_;
-		SavedSearchRow* _tmp6_;
-		SavedSearchRow* _tmp7_;
-		SavedSearch* _tmp8_;
+		SavedSearchRow* _tmp3_;
+		SavedSearchRow* _tmp4_;
+		SavedSearch* _tmp5_;
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = saved_search_db_table_get_instance ();
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp2_ = _tmp1_;
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp3_ = name;
+		_tmp3_ = saved_search_db_table_add (_tmp2_, name, operator, conditions, &_inner_error_);
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp4_ = operator;
-#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp5_ = conditions;
-#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp6_ = saved_search_db_table_add (_tmp2_, _tmp3_, _tmp4_, _tmp5_, &_inner_error_);
-#line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp7_ = _tmp6_;
+		_tmp4_ = _tmp3_;
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_database_table_unref0 (_tmp2_);
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp0_ = _tmp7_;
+		_tmp0_ = _tmp4_;
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6251 "SearchBoolean.c"
+#line 6207 "SearchBoolean.c"
 				goto __catch89_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6268,34 +6224,34 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 			g_clear_error (&_inner_error_);
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return NULL;
-#line 6262 "SearchBoolean.c"
+#line 6218 "SearchBoolean.c"
 		}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp8_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID);
+		_tmp5_ = saved_search_new (_tmp0_, DATA_OBJECT_INVALID_OBJECT_ID);
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_object_unref0 (search);
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		search = _tmp8_;
+		search = _tmp5_;
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_saved_search_row_unref0 (_tmp0_);
-#line 6272 "SearchBoolean.c"
+#line 6228 "SearchBoolean.c"
 	}
 	goto __finally89;
 	__catch89_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp9_;
+		GError* _tmp6_;
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_inner_error_ = NULL;
 #line 928 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp9_ = err;
+		_tmp6_ = err;
 #line 928 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		app_window_database_error (_tmp9_);
+		app_window_database_error (_tmp6_);
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 6289 "SearchBoolean.c"
+#line 6245 "SearchBoolean.c"
 	}
 	__finally89:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6308,60 +6264,59 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		g_clear_error (&_inner_error_);
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return NULL;
-#line 6302 "SearchBoolean.c"
+#line 6258 "SearchBoolean.c"
 	}
 #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp10_ = search;
+	_tmp7_ = search;
 #line 932 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	saved_search_table_add_to_map (self, _tmp10_);
+	saved_search_table_add_to_map (self, _tmp7_);
 #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp11_ = library_window_get_app ();
+	_tmp8_ = library_window_get_app ();
 #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp12_ = _tmp11_;
+	_tmp9_ = _tmp8_;
 #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp13_ = search;
+	_tmp10_ = search;
 #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	library_window_switch_to_saved_search (_tmp12_, _tmp13_);
+	library_window_switch_to_saved_search (_tmp9_, _tmp10_);
 #line 933 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp9_);
 #line 934 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	result = search;
 #line 934 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6322 "SearchBoolean.c"
+#line 6278 "SearchBoolean.c"
 }
 
 
-void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
-	SavedSearch* _tmp5_;
+void
+saved_search_table_remove (SavedSearchTable* self,
+                           SavedSearch* search)
+{
 	GError * _inner_error_ = NULL;
 #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_TABLE (self));
 #line 938 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 6333 "SearchBoolean.c"
+#line 6291 "SearchBoolean.c"
 	{
 		SavedSearchDBTable* _tmp0_;
 		SavedSearchDBTable* _tmp1_;
-		SavedSearch* _tmp2_;
-		SavedSearchID _tmp3_ = {0};
+		SavedSearchID _tmp2_ = {0};
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp0_ = saved_search_db_table_get_instance ();
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_tmp1_ = _tmp0_;
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp2_ = search;
-#line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		saved_search_get_saved_search_id (_tmp2_, &_tmp3_);
+		saved_search_get_saved_search_id (search, &_tmp2_);
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		saved_search_db_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
+		saved_search_db_table_remove (_tmp1_, &_tmp2_, &_inner_error_);
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_database_table_unref0 (_tmp1_);
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6355 "SearchBoolean.c"
+#line 6310 "SearchBoolean.c"
 				goto __catch90_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6370,25 +6325,25 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 			g_clear_error (&_inner_error_);
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return;
-#line 6364 "SearchBoolean.c"
+#line 6319 "SearchBoolean.c"
 		}
 	}
 	goto __finally90;
 	__catch90_database_error:
 	{
 		GError* err = NULL;
-		GError* _tmp4_;
+		GError* _tmp3_;
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		err = _inner_error_;
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_inner_error_ = NULL;
 #line 942 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		_tmp4_ = err;
+		_tmp3_ = err;
 #line 942 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-		app_window_database_error (_tmp4_);
+		app_window_database_error (_tmp3_);
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		_g_error_free0 (err);
-#line 6382 "SearchBoolean.c"
+#line 6337 "SearchBoolean.c"
 	}
 	__finally90:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6399,23 +6354,21 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		g_clear_error (&_inner_error_);
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return;
-#line 6393 "SearchBoolean.c"
+#line 6348 "SearchBoolean.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp5_ = search;
-#line 945 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	saved_search_table_remove_from_map (self, _tmp5_);
-#line 6399 "SearchBoolean.c"
+	saved_search_table_remove_from_map (self, search);
+#line 6352 "SearchBoolean.c"
 }
 
 
-void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search) {
+void
+saved_search_table_add_to_map (SavedSearchTable* self,
+                               SavedSearch* search)
+{
 	GeeHashMap* _tmp0_;
-	SavedSearch* _tmp1_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	gchar* _tmp3_;
-	SavedSearch* _tmp4_;
-	SavedSearch* _tmp5_;
 #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_TABLE (self));
 #line 948 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6423,31 +6376,26 @@ void saved_search_table_add_to_map (SavedSearchTable* self, SavedSearch* search)
 #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = self->priv->search_map;
 #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = search;
+	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject));
 #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp3_ = _tmp2_;
-#line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp4_ = search;
+	_tmp2_ = _tmp1_;
 #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, _tmp4_);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, search);
 #line 949 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp5_ = search;
-#line 950 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL], 0, _tmp5_);
-#line 6432 "SearchBoolean.c"
+	g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL], 0, search);
+#line 6379 "SearchBoolean.c"
 }
 
 
-void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* search) {
+void
+saved_search_table_remove_from_map (SavedSearchTable* self,
+                                    SavedSearch* search)
+{
 	GeeHashMap* _tmp0_;
-	SavedSearch* _tmp1_;
+	gchar* _tmp1_;
 	gchar* _tmp2_;
-	gchar* _tmp3_;
-	SavedSearch* _tmp4_;
 #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_TABLE (self));
 #line 953 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6455,24 +6403,22 @@ void saved_search_table_remove_from_map (SavedSearchTable* self, SavedSearch* se
 #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = self->priv->search_map;
 #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = search;
-#line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
+	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (search, TYPE_DATA_OBJECT, DataObject));
 #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, NULL);
+	gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_, NULL);
 #line 954 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp4_ = search;
-#line 955 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL], 0, _tmp4_);
-#line 6462 "SearchBoolean.c"
+	g_signal_emit (self, saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL], 0, search);
+#line 6406 "SearchBoolean.c"
 }
 
 
-GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) {
+GeeIterable*
+saved_search_table_get_saved_searches (SavedSearchTable* self)
+{
 	GeeIterable* result = NULL;
 	GeeHashMap* _tmp0_;
 	GeeCollection* _tmp1_;
@@ -6489,11 +6435,13 @@ GeeIterable* saved_search_table_get_saved_searches (SavedSearchTable* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
 #line 959 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6483 "SearchBoolean.c"
+#line 6429 "SearchBoolean.c"
 }
 
 
-gint saved_search_table_get_count (SavedSearchTable* self) {
+gint
+saved_search_table_get_count (SavedSearchTable* self)
+{
 	gint result = 0;
 	GeeHashMap* _tmp0_;
 	gint _tmp1_;
@@ -6510,15 +6458,16 @@ gint saved_search_table_get_count (SavedSearchTable* self) {
 	result = _tmp2_;
 #line 963 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6504 "SearchBoolean.c"
+#line 6452 "SearchBoolean.c"
 }
 
 
-gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name) {
+gboolean
+saved_search_table_exists (SavedSearchTable* self,
+                           const gchar* search_name)
+{
 	gboolean result = FALSE;
 	GeeHashMap* _tmp0_;
-	const gchar* _tmp1_;
-	gboolean _tmp2_;
 #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), FALSE);
 #line 966 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6526,50 +6475,47 @@ gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_
 #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp0_ = self->priv->search_map;
 #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp1_ = search_name;
-#line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	result = _tmp2_;
+	result = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search_name);
 #line 967 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6527 "SearchBoolean.c"
+#line 6472 "SearchBoolean.c"
 }
 
 
-gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
+gchar*
+saved_search_table_generate_unique_name (SavedSearchTable* self)
+{
 	gchar* result = NULL;
-	gchar* _tmp7_;
+	gchar* _tmp6_;
 #line 971 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_TABLE (self), NULL);
-#line 6536 "SearchBoolean.c"
+#line 6483 "SearchBoolean.c"
 	{
 		gint ctr = 0;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		ctr = 1;
-#line 6541 "SearchBoolean.c"
+#line 6488 "SearchBoolean.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_tmp0_ = TRUE;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			while (TRUE) {
-#line 6548 "SearchBoolean.c"
+#line 6495 "SearchBoolean.c"
 				gint _tmp2_;
 				gchar* name = NULL;
 				gint _tmp3_;
 				gchar* _tmp4_;
 				const gchar* _tmp5_;
-				gboolean _tmp6_;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				if (!_tmp0_) {
-#line 6557 "SearchBoolean.c"
+#line 6503 "SearchBoolean.c"
 					gint _tmp1_;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					_tmp1_ = ctr;
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					ctr = _tmp1_ + 1;
-#line 6563 "SearchBoolean.c"
+#line 6509 "SearchBoolean.c"
 				}
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp0_ = FALSE;
@@ -6579,7 +6525,7 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 				if (!(_tmp2_ < G_MAXINT)) {
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					break;
-#line 6573 "SearchBoolean.c"
+#line 6519 "SearchBoolean.c"
 				}
 #line 973 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp3_ = ctr;
@@ -6590,129 +6536,152 @@ gchar* saved_search_table_generate_unique_name (SavedSearchTable* self) {
 #line 975 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_tmp5_ = name;
 #line 975 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				_tmp6_ = saved_search_table_exists (self, _tmp5_);
-#line 975 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-				if (!_tmp6_) {
+				if (!saved_search_table_exists (self, _tmp5_)) {
 #line 976 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					result = name;
 #line 976 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 					return result;
-#line 6591 "SearchBoolean.c"
+#line 6535 "SearchBoolean.c"
 				}
 #line 972 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 				_g_free0 (name);
-#line 6595 "SearchBoolean.c"
+#line 6539 "SearchBoolean.c"
 			}
 		}
 	}
 #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	_tmp7_ = g_strdup ("");
+	_tmp6_ = g_strdup ("");
 #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	result = _tmp7_;
+	result = _tmp6_;
 #line 978 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
-#line 6605 "SearchBoolean.c"
+#line 6549 "SearchBoolean.c"
 }
 
 
-static void value_saved_search_table_init (GValue* value) {
+static void
+value_saved_search_table_init (GValue* value)
+{
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	value->data[0].v_pointer = NULL;
-#line 6612 "SearchBoolean.c"
+#line 6558 "SearchBoolean.c"
 }
 
 
-static void value_saved_search_table_free_value (GValue* value) {
+static void
+value_saved_search_table_free_value (GValue* value)
+{
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (value->data[0].v_pointer) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_unref (value->data[0].v_pointer);
-#line 6621 "SearchBoolean.c"
+#line 6569 "SearchBoolean.c"
 	}
 }
 
 
-static void value_saved_search_table_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+value_saved_search_table_copy_value (const GValue* src_value,
+                                     GValue* dest_value)
+{
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (src_value->data[0].v_pointer) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = saved_search_table_ref (src_value->data[0].v_pointer);
-#line 6631 "SearchBoolean.c"
+#line 6582 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6635 "SearchBoolean.c"
+#line 6586 "SearchBoolean.c"
 	}
 }
 
 
-static gpointer value_saved_search_table_peek_pointer (const GValue* value) {
+static gpointer
+value_saved_search_table_peek_pointer (const GValue* value)
+{
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 6643 "SearchBoolean.c"
+#line 6596 "SearchBoolean.c"
 }
 
 
-static gchar* value_saved_search_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_saved_search_table_collect_value (GValue* value,
+                                        guint n_collect_values,
+                                        GTypeCValue* collect_values,
+                                        guint collect_flags)
+{
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (collect_values[0].v_pointer) {
-#line 6650 "SearchBoolean.c"
+#line 6608 "SearchBoolean.c"
 		SavedSearchTable * object;
 		object = collect_values[0].v_pointer;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6657 "SearchBoolean.c"
+#line 6615 "SearchBoolean.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6661 "SearchBoolean.c"
+#line 6619 "SearchBoolean.c"
 		}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = saved_search_table_ref (object);
-#line 6665 "SearchBoolean.c"
+#line 6623 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6669 "SearchBoolean.c"
+#line 6627 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 6673 "SearchBoolean.c"
+#line 6631 "SearchBoolean.c"
 }
 
 
-static gchar* value_saved_search_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+value_saved_search_table_lcopy_value (const GValue* value,
+                                      guint n_collect_values,
+                                      GTypeCValue* collect_values,
+                                      guint collect_flags)
+{
 	SavedSearchTable ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!object_p) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6684 "SearchBoolean.c"
+#line 6647 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (!value->data[0].v_pointer) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = NULL;
-#line 6690 "SearchBoolean.c"
+#line 6653 "SearchBoolean.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6694 "SearchBoolean.c"
+#line 6657 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		*object_p = saved_search_table_ref (value->data[0].v_pointer);
-#line 6698 "SearchBoolean.c"
+#line 6661 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return NULL;
-#line 6702 "SearchBoolean.c"
+#line 6665 "SearchBoolean.c"
 }
 
 
-GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+param_spec_saved_search_table (const gchar* name,
+                               const gchar* nick,
+                               const gchar* blurb,
+                               GType object_type,
+                               GParamFlags flags)
+{
 	ParamSpecSavedSearchTable* spec;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SAVED_SEARCH_TABLE), NULL);
@@ -6722,20 +6691,25 @@ GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return G_PARAM_SPEC (spec);
-#line 6716 "SearchBoolean.c"
+#line 6685 "SearchBoolean.c"
 }
 
 
-gpointer value_get_saved_search_table (const GValue* value) {
+gpointer
+value_get_saved_search_table (const GValue* value)
+{
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE), NULL);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return value->data[0].v_pointer;
-#line 6725 "SearchBoolean.c"
+#line 6696 "SearchBoolean.c"
 }
 
 
-void value_set_saved_search_table (GValue* value, gpointer v_object) {
+void
+value_set_saved_search_table (GValue* value,
+                              gpointer v_object)
+{
 	SavedSearchTable * old;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE));
@@ -6751,22 +6725,25 @@ void value_set_saved_search_table (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_ref (value->data[0].v_pointer);
-#line 6745 "SearchBoolean.c"
+#line 6719 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6749 "SearchBoolean.c"
+#line 6723 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_unref (old);
-#line 6755 "SearchBoolean.c"
+#line 6729 "SearchBoolean.c"
 	}
 }
 
 
-void value_take_saved_search_table (GValue* value, gpointer v_object) {
+void
+value_take_saved_search_table (GValue* value,
+                               gpointer v_object)
+{
 	SavedSearchTable * old;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_TABLE));
@@ -6780,22 +6757,24 @@ void value_take_saved_search_table (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = v_object;
-#line 6774 "SearchBoolean.c"
+#line 6751 "SearchBoolean.c"
 	} else {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		value->data[0].v_pointer = NULL;
-#line 6778 "SearchBoolean.c"
+#line 6755 "SearchBoolean.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (old) {
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		saved_search_table_unref (old);
-#line 6784 "SearchBoolean.c"
+#line 6761 "SearchBoolean.c"
 	}
 }
 
 
-static void saved_search_table_class_init (SavedSearchTableClass * klass) {
+static void
+saved_search_table_class_init (SavedSearchTableClass * klass)
+{
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	saved_search_table_parent_class = g_type_class_peek_parent (klass);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6806,11 +6785,13 @@ static void saved_search_table_class_init (SavedSearchTableClass * klass) {
 	saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_ADDED_SIGNAL] = g_signal_new ("search-added", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	saved_search_table_signals[SAVED_SEARCH_TABLE_SEARCH_REMOVED_SIGNAL] = g_signal_new ("search-removed", TYPE_SAVED_SEARCH_TABLE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 6800 "SearchBoolean.c"
+#line 6779 "SearchBoolean.c"
 }
 
 
-static void saved_search_table_instance_init (SavedSearchTable * self) {
+static void
+saved_search_table_instance_init (SavedSearchTable * self)
+{
 	GeeHashMap* _tmp0_;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->priv = SAVED_SEARCH_TABLE_GET_PRIVATE (self);
@@ -6820,11 +6801,13 @@ static void saved_search_table_instance_init (SavedSearchTable * self) {
 	self->priv->search_map = _tmp0_;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self->ref_count = 1;
-#line 6814 "SearchBoolean.c"
+#line 6795 "SearchBoolean.c"
 }
 
 
-static void saved_search_table_finalize (SavedSearchTable * obj) {
+static void
+saved_search_table_finalize (SavedSearchTable * obj)
+{
 	SavedSearchTable * self;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_TABLE, SavedSearchTable);
@@ -6832,11 +6815,13 @@ static void saved_search_table_finalize (SavedSearchTable * obj) {
 	g_signal_handlers_destroy (self);
 #line 892 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_g_object_unref0 (self->priv->search_map);
-#line 6826 "SearchBoolean.c"
+#line 6809 "SearchBoolean.c"
 }
 
 
-GType saved_search_table_get_type (void) {
+GType
+saved_search_table_get_type (void)
+{
 	static volatile gsize saved_search_table_type_id__volatile = 0;
 	if (g_once_init_enter (&saved_search_table_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { value_saved_search_table_init, value_saved_search_table_free_value, value_saved_search_table_copy_value, value_saved_search_table_peek_pointer, "p", value_saved_search_table_collect_value, "p", value_saved_search_table_lcopy_value };
@@ -6850,18 +6835,22 @@ GType saved_search_table_get_type (void) {
 }
 
 
-gpointer saved_search_table_ref (gpointer instance) {
+gpointer
+saved_search_table_ref (gpointer instance)
+{
 	SavedSearchTable * self;
 	self = instance;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return instance;
-#line 6851 "SearchBoolean.c"
+#line 6838 "SearchBoolean.c"
 }
 
 
-void saved_search_table_unref (gpointer instance) {
+void
+saved_search_table_unref (gpointer instance)
+{
 	SavedSearchTable * self;
 	self = instance;
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6870,7 +6859,7 @@ void saved_search_table_unref (gpointer instance) {
 		SAVED_SEARCH_TABLE_GET_CLASS (self)->finalize (self);
 #line 890 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6864 "SearchBoolean.c"
+#line 6853 "SearchBoolean.c"
 	}
 }
 
diff --git a/src/searches/Searches.c b/src/searches/Searches.c
index 70622ce..f13dde0 100644
--- a/src/searches/Searches.c
+++ b/src/searches/Searches.c
@@ -1,4 +1,4 @@
-/* Searches.c generated by valac 0.36.6, the Vala compiler
+/* Searches.c generated by valac 0.40.4, the Vala compiler
  * generated from Searches.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15,6 +15,7 @@
  * the preconfigure() method, implement it, and ensure in init() that it's been called.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -28,21 +29,27 @@ void searches_terminate (void);
 void searches_sidebar_entry_terminate (void);
 
 
-void searches_preconfigure (void) {
+void
+searches_preconfigure (void)
+{
 }
 
 
-void searches_init (GError** error) {
+void
+searches_init (GError** error)
+{
 #line 23 "/home/jens/Source/shotwell/src/searches/Searches.vala"
 	searches_sidebar_entry_init ();
-#line 39 "Searches.c"
+#line 44 "Searches.c"
 }
 
 
-void searches_terminate (void) {
+void
+searches_terminate (void)
+{
 #line 27 "/home/jens/Source/shotwell/src/searches/Searches.vala"
 	searches_sidebar_entry_terminate ();
-#line 46 "Searches.c"
+#line 53 "Searches.c"
 }
 
 
diff --git a/src/searches/SearchesBranch.c b/src/searches/SearchesBranch.c
index dfa635b..ce75f2a 100644
--- a/src/searches/SearchesBranch.c
+++ b/src/searches/SearchesBranch.c
@@ -1,4 +1,4 @@
-/* SearchesBranch.c generated by valac 0.36.6, the Vala compiler
+/* SearchesBranch.c generated by valac 0.40.4, the Vala compiler
  * generated from SearchesBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gee.h>
@@ -89,6 +90,11 @@ typedef struct _SidebarSimplePageEntryClass SidebarSimplePageEntryClass;
 
 typedef struct _SearchesSidebarEntry SearchesSidebarEntry;
 typedef struct _SearchesSidebarEntryClass SearchesSidebarEntryClass;
+enum  {
+	SEARCHES_BRANCH_0_PROPERTY,
+	SEARCHES_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* searches_branch_properties[SEARCHES_BRANCH_NUM_PROPERTIES];
 
 #define TYPE_SAVED_SEARCH_TABLE (saved_search_table_get_type ())
 #define SAVED_SEARCH_TABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_TABLE, SavedSearchTable))
@@ -186,6 +192,11 @@ typedef struct _SidebarHeaderPrivate SidebarHeaderPrivate;
 typedef struct _SidebarContextable SidebarContextable;
 typedef struct _SidebarContextableIface SidebarContextableIface;
 typedef struct _SearchesHeaderPrivate SearchesHeaderPrivate;
+enum  {
+	SEARCHES_HEADER_0_PROPERTY,
+	SEARCHES_HEADER_NUM_PROPERTIES
+};
+static GParamSpec* searches_header_properties[SEARCHES_HEADER_NUM_PROPERTIES];
 #define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_APPLICATION (application_get_type ())
@@ -235,6 +246,11 @@ typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
 typedef struct _SidebarDestroyableEntry SidebarDestroyableEntry;
 typedef struct _SidebarDestroyableEntryIface SidebarDestroyableEntryIface;
 typedef struct _SearchesSidebarEntryPrivate SearchesSidebarEntryPrivate;
+enum  {
+	SEARCHES_SIDEBAR_ENTRY_0_PROPERTY,
+	SEARCHES_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* searches_sidebar_entry_properties[SEARCHES_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
 #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage))
@@ -494,21 +510,30 @@ GType saved_search_get_type (void) G_GNUC_CONST;
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType searches_sidebar_entry_get_type (void) G_GNUC_CONST;
 #define SEARCHES_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_BRANCH, SearchesBranchPrivate))
-enum  {
-	SEARCHES_BRANCH_DUMMY_PROPERTY
-};
 gpointer saved_search_table_ref (gpointer instance);
 void saved_search_table_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_table (GValue* value, gpointer v_object);
-void value_take_saved_search_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_saved_search_table (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_saved_search_table (GValue* value,
+                                   gpointer v_object);
+void value_take_saved_search_table (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_saved_search_table (const GValue* value);
 GType saved_search_table_get_type (void) G_GNUC_CONST;
 SavedSearchTable* saved_search_table_get_instance (void);
-static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search);
-static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self);
-static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search);
-static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self);
+static void searches_branch_on_saved_search_added (SearchesBranch* self,
+                                            SavedSearch* search);
+static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender,
+                                                                             SavedSearch* search,
+                                                                             gpointer self);
+static void searches_branch_on_saved_search_removed (SearchesBranch* self,
+                                              SavedSearch* search);
+static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender,
+                                                                                 SavedSearch* search,
+                                                                                 gpointer self);
 SearchesBranch* searches_branch_new (void);
 SearchesBranch* searches_branch_construct (GType object_type);
 SearchesHeader* searches_header_new (void);
@@ -519,52 +544,75 @@ GType searches_header_get_type (void) G_GNUC_CONST;
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
-static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
+static gint searches_branch_comparator (SidebarEntry* a,
+                                 SidebarEntry* b);
+static gint _searches_branch_comparator_gcompare_func (gconstpointer a,
+                                                gconstpointer b);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+                                   SidebarBranchOptions options,
+                                   GCompareFunc default_comparator,
+                                   GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+                                         SidebarEntry* root,
+                                         SidebarBranchOptions options,
+                                         GCompareFunc default_comparator,
+                                         GCompareFunc root_comparator);
 GeeCollection* saved_search_table_get_all (SavedSearchTable* self);
-SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search);
-gint saved_search_compare_names (void* a, void* b);
+SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self,
+                                                                  SavedSearch* search);
+gint saved_search_compare_names (void* a,
+                                 void* b);
 SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self);
 SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search);
-SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type,
+                                                        SavedSearch* search);
+void sidebar_branch_graft (SidebarBranch* self,
+                           SidebarEntry* parent,
+                           SidebarEntry* entry,
+                           GCompareFunc comparator);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
+void sidebar_branch_prune (SidebarBranch* self,
+                           SidebarEntry* entry);
 static void searches_branch_finalize (GObject * obj);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_renameable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_emphasizable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 #define SEARCHES_HEADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_HEADER, SearchesHeaderPrivate))
-enum  {
-	SEARCHES_HEADER_DUMMY_PROPERTY
-};
-SidebarHeader* sidebar_header_new (const gchar* name, const gchar* tooltip, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, const gchar* tooltip, gboolean emphasized);
+SidebarHeader* sidebar_header_new (const gchar* name,
+                                   const gchar* tooltip,
+                                   gboolean emphasized);
+SidebarHeader* sidebar_header_construct (GType object_type,
+                                         const gchar* name,
+                                         const gchar* tooltip,
+                                         gboolean emphasized);
 static void searches_header_setup_context_menu (SearchesHeader* self);
 gchar* resources_get_ui (const gchar* filename);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+void app_window_error_message (const gchar* message,
+                               GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
+GParamSpec* param_spec_application (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_application (GValue* value,
+                            gpointer v_object);
+void value_take_application (GValue* value,
+                             gpointer v_object);
 gpointer value_get_application (const GValue* value);
 GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
 void application_panic (Application* self);
-static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
+static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base,
+                                                        GdkEventButton* event);
 static void searches_header_finalize (GObject * obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
 GType sidebar_destroyable_entry_get_type (void) G_GNUC_CONST;
 #define SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntryPrivate))
-enum  {
-	SEARCHES_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
 void searches_sidebar_entry_init (void);
 void searches_sidebar_entry_terminate (void);
@@ -573,26 +621,39 @@ gchar* data_object_get_name (DataObject* self);
 static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
 static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
 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);
 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;
 static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base);
-static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name);
-gboolean saved_search_table_exists (SavedSearchTable* self, const gchar* search_name);
+static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base,
+                                         const gchar* new_name);
+gboolean saved_search_table_exists (SavedSearchTable* self,
+                                    const gchar* search_name);
 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);
-RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search, const gchar* new_name);
-RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type, SavedSearch* search, const gchar* new_name);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
+RenameSavedSearchCommand* rename_saved_search_command_new (SavedSearch* search,
+                                                           const gchar* new_name);
+RenameSavedSearchCommand* rename_saved_search_command_construct (GType object_type,
+                                                                 SavedSearch* search,
+                                                                 const gchar* new_name);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
 GType rename_saved_search_command_get_type (void) G_GNUC_CONST;
@@ -600,42 +661,56 @@ gchar* resources_rename_search_exists_message (const gchar* name);
 static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base);
 gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
 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 delete_saved_search_command_get_type (void) G_GNUC_CONST;
 static void searches_sidebar_entry_finalize (GObject * obj);
 
 
-static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
+static void
+_searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender,
+                                                                        SavedSearch* search,
+                                                                        gpointer self)
+{
 #line 28 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_branch_on_saved_search_added ((SearchesBranch*) self, search);
-#line 612 "SearchesBranch.c"
+#line 678 "SearchesBranch.c"
 }
 
 
-static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
+static void
+_searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender,
+                                                                            SavedSearch* search,
+                                                                            gpointer self)
+{
 #line 29 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_branch_on_saved_search_removed ((SearchesBranch*) self, search);
-#line 619 "SearchesBranch.c"
+#line 689 "SearchesBranch.c"
 }
 
 
-static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_searches_branch_comparator_gcompare_func (gconstpointer a,
+                                           gconstpointer b)
+{
 	gint result;
 	result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 628 "SearchesBranch.c"
+#line 701 "SearchesBranch.c"
 }
 
 
-SearchesBranch* searches_branch_construct (GType object_type) {
+SearchesBranch*
+searches_branch_construct (GType object_type)
+{
 	SearchesBranch * self = NULL;
 	SearchesHeader* _tmp0_;
 	SearchesHeader* _tmp1_;
+	SavedSearchTable* _tmp12_;
 	SavedSearchTable* _tmp13_;
 	SavedSearchTable* _tmp14_;
 	SavedSearchTable* _tmp15_;
-	SavedSearchTable* _tmp16_;
 #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = searches_header_new ();
 #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -644,7 +719,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL);
 #line 12 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 648 "SearchesBranch.c"
+#line 723 "SearchesBranch.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp2_;
@@ -673,75 +748,76 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 		_search_it = _tmp7_;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		while (TRUE) {
-#line 677 "SearchesBranch.c"
+#line 752 "SearchesBranch.c"
 			GeeIterator* _tmp8_;
-			gboolean _tmp9_;
 			SavedSearch* search = NULL;
-			GeeIterator* _tmp10_;
-			gpointer _tmp11_;
-			SavedSearch* _tmp12_;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			SavedSearch* _tmp11_;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_tmp8_ = _search_it;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			if (!_tmp9_) {
+			if (!gee_iterator_next (_tmp8_)) {
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 				break;
-#line 692 "SearchesBranch.c"
+#line 764 "SearchesBranch.c"
 			}
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_tmp10_ = _search_it;
+			_tmp9_ = _search_it;
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_tmp11_ = gee_iterator_get (_tmp10_);
+			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			search = (SavedSearch*) _tmp11_;
+			search = (SavedSearch*) _tmp10_;
 #line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_tmp12_ = search;
+			_tmp11_ = search;
 #line 20 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			searches_branch_on_saved_search_added (self, _tmp12_);
+			searches_branch_on_saved_search_added (self, _tmp11_);
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 			_g_object_unref0 (search);
-#line 706 "SearchesBranch.c"
+#line 778 "SearchesBranch.c"
 		}
 #line 19 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (_search_it);
-#line 710 "SearchesBranch.c"
+#line 782 "SearchesBranch.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp13_ = saved_search_table_get_instance ();
+	_tmp12_ = saved_search_table_get_instance ();
 #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	g_signal_connect_object (_tmp14_, "search-added", (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self, 0);
+	g_signal_connect_object (_tmp13_, "search-added", (GCallback) _searches_branch_on_saved_search_added_saved_search_table_search_added, self, 0);
 #line 23 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_saved_search_table_unref0 (_tmp14_);
+	_saved_search_table_unref0 (_tmp13_);
 #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp15_ = saved_search_table_get_instance ();
+	_tmp14_ = saved_search_table_get_instance ();
 #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	g_signal_connect_object (_tmp16_, "search-removed", (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self, 0);
+	g_signal_connect_object (_tmp15_, "search-removed", (GCallback) _searches_branch_on_saved_search_removed_saved_search_table_search_removed, self, 0);
 #line 24 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_saved_search_table_unref0 (_tmp16_);
+	_saved_search_table_unref0 (_tmp15_);
 #line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self;
-#line 730 "SearchesBranch.c"
+#line 802 "SearchesBranch.c"
 }
 
 
-SearchesBranch* searches_branch_new (void) {
+SearchesBranch*
+searches_branch_new (void)
+{
 #line 11 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return searches_branch_construct (SEARCHES_TYPE_BRANCH);
-#line 737 "SearchesBranch.c"
+#line 811 "SearchesBranch.c"
 }
 
 
-SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search) {
+SearchesSidebarEntry*
+searches_branch_get_entry_for_saved_search (SearchesBranch* self,
+                                            SavedSearch* search)
+{
 	SearchesSidebarEntry* result = NULL;
 	GeeHashMap* _tmp0_;
-	SavedSearch* _tmp1_;
-	gpointer _tmp2_;
+	gpointer _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (SEARCHES_IS_BRANCH (self), NULL);
 #line 32 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -749,68 +825,55 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch
 #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->entry_map;
 #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp1_ = search;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search);
 #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	result = (SearchesSidebarEntry*) _tmp2_;
+	result = (SearchesSidebarEntry*) _tmp1_;
 #line 33 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 760 "SearchesBranch.c"
+#line 834 "SearchesBranch.c"
 }
 
 
-static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+searches_branch_comparator (SidebarEntry* a,
+                            SidebarEntry* b)
+{
 	gint result = 0;
-	SidebarEntry* _tmp0_;
-	SidebarEntry* _tmp1_;
-	SidebarEntry* _tmp2_;
-	SavedSearch* _tmp3_;
-	SidebarEntry* _tmp4_;
-	SavedSearch* _tmp5_;
-	gint _tmp6_;
+	SavedSearch* _tmp0_;
+	SavedSearch* _tmp1_;
 #line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 36 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
 #line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp0_ = a;
-#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp1_ = b;
-#line 37 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (a == b) {
 #line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		result = 0;
 #line 38 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		return result;
-#line 787 "SearchesBranch.c"
+#line 855 "SearchesBranch.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp2_ = a;
-#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp3_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
-#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp4_ = b;
+	_tmp0_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (a, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
 #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp5_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
+	_tmp1_ = searches_sidebar_entry_for_saved_search (G_TYPE_CHECK_INSTANCE_CAST (b, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry));
 #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp6_ = saved_search_compare_names (_tmp3_, _tmp5_);
-#line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	result = _tmp6_;
+	result = saved_search_compare_names (_tmp0_, _tmp1_);
 #line 40 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 803 "SearchesBranch.c"
+#line 865 "SearchesBranch.c"
 }
 
 
-static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSearch* search) {
+static void
+searches_branch_on_saved_search_added (SearchesBranch* self,
+                                       SavedSearch* search)
+{
 	SearchesSidebarEntry* entry = NULL;
-	SavedSearch* _tmp0_;
-	SearchesSidebarEntry* _tmp1_;
-	GeeHashMap* _tmp2_;
-	SavedSearch* _tmp3_;
-	SidebarEntry* _tmp4_;
-	SidebarEntry* _tmp5_;
+	SearchesSidebarEntry* _tmp0_;
+	GeeHashMap* _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
 #line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
 #line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -818,40 +881,37 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe
 #line 45 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_debug ("SearchesBranch.vala:45: search added");
 #line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp0_ = search;
+	_tmp0_ = searches_sidebar_entry_new (search);
 #line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp1_ = searches_sidebar_entry_new (_tmp0_);
-#line 46 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	entry = _tmp1_;
-#line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp2_ = self->priv->entry_map;
+	entry = _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp3_ = search;
+	_tmp1_ = self->priv->entry_map;
 #line 47 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_, entry);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search, entry);
 #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp4_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = _tmp2_;
 #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
+	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 48 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp3_);
 #line 44 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (entry);
-#line 843 "SearchesBranch.c"
+#line 902 "SearchesBranch.c"
 }
 
 
-static void searches_branch_on_saved_search_removed (SearchesBranch* self, SavedSearch* search) {
+static void
+searches_branch_on_saved_search_removed (SearchesBranch* self,
+                                         SavedSearch* search)
+{
 	SearchesSidebarEntry* entry = NULL;
 	GeeHashMap* _tmp0_;
-	SavedSearch* _tmp1_;
-	gpointer _tmp2_;
+	gpointer _tmp1_;
 	gboolean is_removed = FALSE;
-	GeeHashMap* _tmp3_;
-	SavedSearch* _tmp4_;
-	gboolean _tmp5_;
+	GeeHashMap* _tmp2_;
+	gboolean _tmp3_;
 #line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_if_fail (SEARCHES_IS_BRANCH (self));
 #line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -861,43 +921,43 @@ static void searches_branch_on_saved_search_removed (SearchesBranch* self, Saved
 #line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->entry_map;
 #line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp1_ = search;
-#line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search);
 #line 53 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	entry = (SearchesSidebarEntry*) _tmp2_;
+	entry = (SearchesSidebarEntry*) _tmp1_;
 #line 54 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_vala_assert (entry != NULL, "entry != null");
 #line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp3_ = self->priv->entry_map;
-#line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp4_ = search;
+	_tmp2_ = self->priv->entry_map;
 #line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp5_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, NULL);
+	_tmp3_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), search, NULL);
 #line 56 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	is_removed = _tmp5_;
+	is_removed = _tmp3_;
 #line 57 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_vala_assert (is_removed, "is_removed");
 #line 59 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 51 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (entry);
-#line 886 "SearchesBranch.c"
+#line 942 "SearchesBranch.c"
 }
 
 
-static void searches_branch_class_init (SearchesBranchClass * klass) {
+static void
+searches_branch_class_init (SearchesBranchClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_branch_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesBranchPrivate));
 #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize;
-#line 897 "SearchesBranch.c"
+#line 955 "SearchesBranch.c"
 }
 
 
-static void searches_branch_instance_init (SearchesBranch * self) {
+static void
+searches_branch_instance_init (SearchesBranch * self)
+{
 	GeeHashMap* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv = SEARCHES_BRANCH_GET_PRIVATE (self);
@@ -905,11 +965,13 @@ static void searches_branch_instance_init (SearchesBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 909 "SearchesBranch.c"
+#line 969 "SearchesBranch.c"
 }
 
 
-static void searches_branch_finalize (GObject * obj) {
+static void
+searches_branch_finalize (GObject * obj)
+{
 	SearchesBranch * self;
 	SavedSearchTable* _tmp0_;
 	SavedSearchTable* _tmp1_;
@@ -943,11 +1005,13 @@ static void searches_branch_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->entry_map);
 #line 7 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj);
-#line 947 "SearchesBranch.c"
+#line 1009 "SearchesBranch.c"
 }
 
 
-GType searches_branch_get_type (void) {
+GType
+searches_branch_get_type (void)
+{
 	static volatile gsize searches_branch_type_id__volatile = 0;
 	if (g_once_init_enter (&searches_branch_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchesBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesBranch), 0, (GInstanceInitFunc) searches_branch_instance_init, NULL };
@@ -959,7 +1023,9 @@ GType searches_branch_get_type (void) {
 }
 
 
-SearchesHeader* searches_header_construct (GType object_type) {
+SearchesHeader*
+searches_header_construct (GType object_type)
+{
 	SearchesHeader * self = NULL;
 #line 68 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = (SearchesHeader*) sidebar_header_construct (object_type, _ ("Saved Searches"), _ ("Organize your saved searches"), TRUE);
@@ -967,25 +1033,31 @@ SearchesHeader* searches_header_construct (GType object_type) {
 	searches_header_setup_context_menu (self);
 #line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self;
-#line 971 "SearchesBranch.c"
+#line 1037 "SearchesBranch.c"
 }
 
 
-SearchesHeader* searches_header_new (void) {
+SearchesHeader*
+searches_header_new (void)
+{
 #line 67 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 978 "SearchesBranch.c"
+#line 1046 "SearchesBranch.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 985 "SearchesBranch.c"
+#line 1055 "SearchesBranch.c"
 }
 
 
-static void searches_header_setup_context_menu (SearchesHeader* self) {
+static void
+searches_header_setup_context_menu (SearchesHeader* self)
+{
 	GtkBuilder* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -996,7 +1068,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 73 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv->builder = _tmp0_;
-#line 1000 "SearchesBranch.c"
+#line 1072 "SearchesBranch.c"
 	{
 		GtkBuilder* _tmp1_;
 		gchar* _tmp2_;
@@ -1019,7 +1091,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_g_free0 (_tmp3_);
 #line 75 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1023 "SearchesBranch.c"
+#line 1095 "SearchesBranch.c"
 			goto __catch85_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -1042,7 +1114,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		self->priv->context_menu = _tmp8_;
 #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_object_unref0 (model);
-#line 1046 "SearchesBranch.c"
+#line 1118 "SearchesBranch.c"
 	}
 	goto __finally85;
 	__catch85_g_error:
@@ -1080,7 +1152,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_application_unref0 (_tmp14_);
 #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		_g_error_free0 (_error_);
-#line 1084 "SearchesBranch.c"
+#line 1156 "SearchesBranch.c"
 	}
 	__finally85:
 #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -1091,12 +1163,15 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 		return;
-#line 1095 "SearchesBranch.c"
+#line 1167 "SearchesBranch.c"
 	}
 }
 
 
-static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event) {
+static GtkMenu*
+searches_header_real_get_sidebar_context_menu (SidebarContextable* base,
+                                               GdkEventButton* event)
+{
 	SearchesHeader * self;
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_;
@@ -1111,40 +1186,48 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl
 	result = _tmp1_;
 #line 86 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1115 "SearchesBranch.c"
+#line 1190 "SearchesBranch.c"
 }
 
 
-static void searches_header_class_init (SearchesHeaderClass * klass) {
+static void
+searches_header_class_init (SearchesHeaderClass * klass)
+{
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_header_parent_class = g_type_class_peek_parent (klass);
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1126 "SearchesBranch.c"
+#line 1203 "SearchesBranch.c"
 }
 
 
-static void searches_header_sidebar_contextable_interface_init (SidebarContextableIface * iface) {
+static void
+searches_header_sidebar_contextable_interface_init (SidebarContextableIface * iface)
+{
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*) (SidebarContextable *, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1135 "SearchesBranch.c"
+#line 1214 "SearchesBranch.c"
 }
 
 
-static void searches_header_instance_init (SearchesHeader * self) {
+static void
+searches_header_instance_init (SearchesHeader * self)
+{
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
 #line 65 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv->context_menu = NULL;
-#line 1144 "SearchesBranch.c"
+#line 1225 "SearchesBranch.c"
 }
 
 
-static void searches_header_finalize (GObject * obj) {
+static void
+searches_header_finalize (GObject * obj)
+{
 	SearchesHeader * self;
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader);
@@ -1154,11 +1237,13 @@ static void searches_header_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 63 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1158 "SearchesBranch.c"
+#line 1241 "SearchesBranch.c"
 }
 
 
-GType searches_header_get_type (void) {
+GType
+searches_header_get_type (void)
+{
 	static volatile gsize searches_header_type_id__volatile = 0;
 	if (g_once_init_enter (&searches_header_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchesHeaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_header_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesHeader), 0, (GInstanceInitFunc) searches_header_instance_init, NULL };
@@ -1172,44 +1257,52 @@ GType searches_header_get_type (void) {
 }
 
 
-SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, SavedSearch* search) {
+SearchesSidebarEntry*
+searches_sidebar_entry_construct (GType object_type,
+                                  SavedSearch* search)
+{
 	SearchesSidebarEntry * self = NULL;
 	SavedSearch* _tmp0_;
-	SavedSearch* _tmp1_;
 #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
 #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp0_ = search;
-#line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (search);
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_g_object_unref0 (self->priv->search);
 #line 97 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	self->priv->search = _tmp1_;
+	self->priv->search = _tmp0_;
 #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return self;
-#line 1194 "SearchesBranch.c"
+#line 1279 "SearchesBranch.c"
 }
 
 
-SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
+SearchesSidebarEntry*
+searches_sidebar_entry_new (SavedSearch* search)
+{
 #line 96 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1201 "SearchesBranch.c"
+#line 1288 "SearchesBranch.c"
 }
 
 
-void searches_sidebar_entry_init (void) {
+void
+searches_sidebar_entry_init (void)
+{
 }
 
 
-void searches_sidebar_entry_terminate (void) {
+void
+searches_sidebar_entry_terminate (void)
+{
 }
 
 
-SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self) {
+SavedSearch*
+searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self)
+{
 	SavedSearch* result = NULL;
 	SavedSearch* _tmp0_;
 	SavedSearch* _tmp1_;
@@ -1223,11 +1316,13 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self
 	result = _tmp1_;
 #line 107 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1227 "SearchesBranch.c"
+#line 1320 "SearchesBranch.c"
 }
 
 
-static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	SearchesSidebarEntry * self;
 	gchar* result = NULL;
 	SavedSearch* _tmp0_;
@@ -1242,11 +1337,13 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt
 	result = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1246 "SearchesBranch.c"
+#line 1341 "SearchesBranch.c"
 }
 
 
-static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	SearchesSidebarEntry * self;
 	gchar* result = NULL;
 	const gchar* _tmp0_;
@@ -1261,11 +1358,13 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	result = _tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1265 "SearchesBranch.c"
+#line 1362 "SearchesBranch.c"
 }
 
 
-static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	SearchesSidebarEntry * self;
 	Page* result = NULL;
 	SavedSearch* _tmp0_;
@@ -1282,11 +1381,13 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 119 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1286 "SearchesBranch.c"
+#line 1385 "SearchesBranch.c"
 }
 
 
-static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
+static gboolean
+searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base)
+{
 	SearchesSidebarEntry * self;
 	gboolean result = FALSE;
 #line 122 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -1295,17 +1396,18 @@ static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameabl
 	result = TRUE;
 #line 123 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	return result;
-#line 1299 "SearchesBranch.c"
+#line 1400 "SearchesBranch.c"
 }
 
 
-static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, const gchar* new_name) {
+static void
+searches_sidebar_entry_real_rename (SidebarRenameableEntry* base,
+                                    const gchar* new_name)
+{
 	SearchesSidebarEntry * self;
 	SavedSearchTable* _tmp0_;
 	SavedSearchTable* _tmp1_;
-	const gchar* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp2_;
 #line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 126 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
@@ -1315,121 +1417,109 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp1_ = _tmp0_;
 #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp2_ = new_name;
-#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_);
-#line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp4_ = !_tmp3_;
+	_tmp2_ = !saved_search_table_exists (_tmp1_, new_name);
 #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_saved_search_table_unref0 (_tmp1_);
 #line 127 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	if (_tmp4_) {
-#line 1328 "SearchesBranch.c"
-		CommandManager* _tmp5_;
-		CommandManager* _tmp6_;
-		SavedSearch* _tmp7_;
-		const gchar* _tmp8_;
-		RenameSavedSearchCommand* _tmp9_;
-		RenameSavedSearchCommand* _tmp10_;
-#line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp5_ = app_window_get_command_manager ();
+	if (_tmp2_) {
+#line 1426 "SearchesBranch.c"
+		CommandManager* _tmp3_;
+		CommandManager* _tmp4_;
+		SavedSearch* _tmp5_;
+		RenameSavedSearchCommand* _tmp6_;
+		RenameSavedSearchCommand* _tmp7_;
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp6_ = _tmp5_;
+		_tmp3_ = app_window_get_command_manager ();
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp7_ = self->priv->search;
+		_tmp4_ = _tmp3_;
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp8_ = new_name;
+		_tmp5_ = self->priv->search;
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_);
+		_tmp6_ = rename_saved_search_command_new (_tmp5_, new_name);
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp10_ = _tmp9_;
+		_tmp7_ = _tmp6_;
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command));
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_g_object_unref0 (_tmp10_);
+		_g_object_unref0 (_tmp7_);
 #line 128 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_command_manager_unref0 (_tmp6_);
-#line 1353 "SearchesBranch.c"
+		_command_manager_unref0 (_tmp4_);
+#line 1448 "SearchesBranch.c"
 	} else {
-		const gchar* _tmp11_;
-		SavedSearch* _tmp12_;
-		gchar* _tmp13_;
-		gchar* _tmp14_;
-		gboolean _tmp15_;
-#line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp11_ = new_name;
+		SavedSearch* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+		gboolean _tmp11_;
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp12_ = self->priv->search;
+		_tmp8_ = self->priv->search;
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
+		_tmp9_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp14_ = _tmp13_;
+		_tmp10_ = _tmp9_;
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0;
+		_tmp11_ = g_strcmp0 (new_name, _tmp10_) != 0;
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_g_free0 (_tmp14_);
+		_g_free0 (_tmp10_);
 #line 129 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		if (_tmp15_) {
-#line 1374 "SearchesBranch.c"
-			const gchar* _tmp16_;
-			gchar* _tmp17_;
-			gchar* _tmp18_;
-#line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_tmp16_ = new_name;
+		if (_tmp11_) {
+#line 1466 "SearchesBranch.c"
+			gchar* _tmp12_;
+			gchar* _tmp13_;
 #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
+			_tmp12_ = resources_rename_search_exists_message (new_name);
 #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_tmp18_ = _tmp17_;
+			_tmp13_ = _tmp12_;
 #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			app_window_error_message (_tmp18_, NULL);
+			app_window_error_message (_tmp13_, NULL);
 #line 130 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-			_g_free0 (_tmp18_);
-#line 1388 "SearchesBranch.c"
+			_g_free0 (_tmp13_);
+#line 1477 "SearchesBranch.c"
 		}
 	}
 }
 
 
-static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base) {
+static void
+searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* base)
+{
 	SearchesSidebarEntry * self;
 	SavedSearch* _tmp0_;
-	gboolean _tmp1_;
 #line 133 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
 #line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	_tmp0_ = self->priv->search;
 #line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-	if (_tmp1_) {
-#line 1406 "SearchesBranch.c"
+	if (dialogs_confirm_delete_saved_search (_tmp0_)) {
+#line 1494 "SearchesBranch.c"
+		CommandManager* _tmp1_;
 		CommandManager* _tmp2_;
-		CommandManager* _tmp3_;
-		SavedSearch* _tmp4_;
+		SavedSearch* _tmp3_;
+		DeleteSavedSearchCommand* _tmp4_;
 		DeleteSavedSearchCommand* _tmp5_;
-		DeleteSavedSearchCommand* _tmp6_;
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp2_ = app_window_get_command_manager ();
+		_tmp1_ = app_window_get_command_manager ();
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp4_ = self->priv->search;
+		_tmp3_ = self->priv->search;
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp5_ = delete_saved_search_command_new (_tmp4_);
+		_tmp4_ = delete_saved_search_command_new (_tmp3_);
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.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 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_g_object_unref0 (_tmp6_);
+		_g_object_unref0 (_tmp5_);
 #line 135 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
-		_command_manager_unref0 (_tmp3_);
-#line 1428 "SearchesBranch.c"
+		_command_manager_unref0 (_tmp2_);
+#line 1516 "SearchesBranch.c"
 	}
 }
 
 
-static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
+static void
+searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass)
+{
 	gchar* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
@@ -1447,38 +1537,46 @@ static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass
 	_tmp0_ = g_strdup ("edit-find");
 #line 92 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1451 "SearchesBranch.c"
+#line 1541 "SearchesBranch.c"
 }
 
 
-static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
+static void
+searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface)
+{
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->is_user_renameable = (gboolean (*) (SidebarRenameableEntry *)) searches_sidebar_entry_real_is_user_renameable;
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->rename = (void (*) (SidebarRenameableEntry *, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1462 "SearchesBranch.c"
+#line 1554 "SearchesBranch.c"
 }
 
 
-static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
+static void
+searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface)
+{
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	iface->destroy_source = (void (*) (SidebarDestroyableEntry *)) searches_sidebar_entry_real_destroy_source;
-#line 1471 "SearchesBranch.c"
+#line 1565 "SearchesBranch.c"
 }
 
 
-static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
+static void
+searches_sidebar_entry_instance_init (SearchesSidebarEntry * self)
+{
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1478 "SearchesBranch.c"
+#line 1574 "SearchesBranch.c"
 }
 
 
-static void searches_sidebar_entry_finalize (GObject * obj) {
+static void
+searches_sidebar_entry_finalize (GObject * obj)
+{
 	SearchesSidebarEntry * self;
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
@@ -1486,11 +1584,13 @@ static void searches_sidebar_entry_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->search);
 #line 90 "/home/jens/Source/shotwell/src/searches/SearchesBranch.vala"
 	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1490 "SearchesBranch.c"
+#line 1588 "SearchesBranch.c"
 }
 
 
-GType searches_sidebar_entry_get_type (void) {
+GType
+searches_sidebar_entry_get_type (void)
+{
 	static volatile gsize searches_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&searches_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SearchesSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) searches_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SearchesSidebarEntry), 0, (GInstanceInitFunc) searches_sidebar_entry_instance_init, NULL };
-- 
cgit v1.2.3