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/library/Branch.c           | 2165 --------------
 src/library/Branch.vala        |  147 -
 src/library/LibraryBranch.c    | 2165 ++++++++++++++
 src/library/LibraryBranch.vala |  147 +
 src/library/LibraryWindow.c    | 6252 ++++++++++++++++++++--------------------
 src/library/LibraryWindow.vala |   17 +-
 src/library/TrashPage.c        |  319 +-
 src/library/TrashPage.vala     |    2 -
 8 files changed, 5633 insertions(+), 5581 deletions(-)
 delete mode 100644 src/library/Branch.c
 delete mode 100644 src/library/Branch.vala
 create mode 100644 src/library/LibraryBranch.c
 create mode 100644 src/library/LibraryBranch.vala

(limited to 'src/library')

diff --git a/src/library/Branch.c b/src/library/Branch.c
deleted file mode 100644
index 92955e2..0000000
--- a/src/library/Branch.c
+++ /dev/null
@@ -1,2165 +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 Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gio/gio.h>
-#include <gee.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 LIBRARY_TYPE_BRANCH (library_branch_get_type ())
-#define LIBRARY_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_BRANCH, LibraryBranch))
-#define LIBRARY_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_BRANCH, LibraryBranchClass))
-#define LIBRARY_IS_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_BRANCH))
-#define LIBRARY_IS_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_BRANCH))
-#define LIBRARY_BRANCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_BRANCH, LibraryBranchClass))
-
-typedef struct _LibraryBranch LibraryBranch;
-typedef struct _LibraryBranchClass LibraryBranchClass;
-typedef struct _LibraryBranchPrivate LibraryBranchPrivate;
-
-#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 LIBRARY_TYPE_PHOTOS_ENTRY (library_photos_entry_get_type ())
-#define LIBRARY_PHOTOS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry))
-#define LIBRARY_PHOTOS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntryClass))
-#define LIBRARY_IS_PHOTOS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_PHOTOS_ENTRY))
-#define LIBRARY_IS_PHOTOS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_PHOTOS_ENTRY))
-#define LIBRARY_PHOTOS_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntryClass))
-
-typedef struct _LibraryPhotosEntry LibraryPhotosEntry;
-typedef struct _LibraryPhotosEntryClass LibraryPhotosEntryClass;
-
-#define LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY (library_hideable_page_entry_get_type ())
-#define LIBRARY_HIDEABLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry))
-#define LIBRARY_HIDEABLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryClass))
-#define LIBRARY_IS_HIDEABLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY))
-#define LIBRARY_IS_HIDEABLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY))
-#define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryClass))
-
-typedef struct _LibraryHideablePageEntry LibraryHideablePageEntry;
-typedef struct _LibraryHideablePageEntryClass LibraryHideablePageEntryClass;
-
-#define LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY (library_flagged_sidebar_entry_get_type ())
-#define LIBRARY_FLAGGED_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry))
-#define LIBRARY_FLAGGED_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntryClass))
-#define LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY))
-#define LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY))
-#define LIBRARY_FLAGGED_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntryClass))
-
-typedef struct _LibraryFlaggedSidebarEntry LibraryFlaggedSidebarEntry;
-typedef struct _LibraryFlaggedSidebarEntryClass LibraryFlaggedSidebarEntryClass;
-
-#define LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY (library_last_import_sidebar_entry_get_type ())
-#define LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry))
-#define LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntryClass))
-#define LIBRARY_IS_LAST_IMPORT_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY))
-#define LIBRARY_IS_LAST_IMPORT_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY))
-#define LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntryClass))
-
-typedef struct _LibraryLastImportSidebarEntry LibraryLastImportSidebarEntry;
-typedef struct _LibraryLastImportSidebarEntryClass LibraryLastImportSidebarEntryClass;
-
-#define LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY (library_import_queue_sidebar_entry_get_type ())
-#define LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry))
-#define LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntryClass))
-#define LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY))
-#define LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY))
-#define LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntryClass))
-
-typedef struct _LibraryImportQueueSidebarEntry LibraryImportQueueSidebarEntry;
-typedef struct _LibraryImportQueueSidebarEntryClass LibraryImportQueueSidebarEntryClass;
-
-#define LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY (library_offline_sidebar_entry_get_type ())
-#define LIBRARY_OFFLINE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry))
-#define LIBRARY_OFFLINE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntryClass))
-#define LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY))
-#define LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY))
-#define LIBRARY_OFFLINE_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntryClass))
-
-typedef struct _LibraryOfflineSidebarEntry LibraryOfflineSidebarEntry;
-typedef struct _LibraryOfflineSidebarEntryClass LibraryOfflineSidebarEntryClass;
-
-#define LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY (library_trash_sidebar_entry_get_type ())
-#define LIBRARY_TRASH_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry))
-#define LIBRARY_TRASH_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntryClass))
-#define LIBRARY_IS_TRASH_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY))
-#define LIBRARY_IS_TRASH_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY))
-#define LIBRARY_TRASH_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntryClass))
-
-typedef struct _LibraryTrashSidebarEntry LibraryTrashSidebarEntry;
-typedef struct _LibraryTrashSidebarEntryClass LibraryTrashSidebarEntryClass;
-
-#define LIBRARY_BRANCH_TYPE_ENTRY_POSITION (library_branch_entry_position_get_type ())
-#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 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_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;
-
-#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 _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
-typedef struct _LibraryPhotosEntryPrivate LibraryPhotosEntryPrivate;
-
-#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 LIBRARY_TYPE_MAIN_PAGE (library_main_page_get_type ())
-#define LIBRARY_MAIN_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage))
-#define LIBRARY_MAIN_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_MAIN_PAGE, LibraryMainPageClass))
-#define LIBRARY_IS_MAIN_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_MAIN_PAGE))
-#define LIBRARY_IS_MAIN_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_MAIN_PAGE))
-#define LIBRARY_MAIN_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_MAIN_PAGE, LibraryMainPageClass))
-
-typedef struct _LibraryMainPage LibraryMainPage;
-typedef struct _LibraryMainPageClass LibraryMainPageClass;
-typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
-enum  {
-	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL,
-	LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL
-};
-static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL] = {0};
-typedef struct _PagePrivate PagePrivate;
-
-#define TYPE_PAGE_WINDOW (page_window_get_type ())
-#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
-#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
-#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
-#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
-#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
-
-typedef struct _PageWindow PageWindow;
-typedef struct _PageWindowClass PageWindowClass;
-
-#define TYPE_FULLSCREEN_WINDOW (fullscreen_window_get_type ())
-#define FULLSCREEN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FULLSCREEN_WINDOW, FullscreenWindow))
-#define FULLSCREEN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FULLSCREEN_WINDOW, FullscreenWindowClass))
-#define IS_FULLSCREEN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FULLSCREEN_WINDOW))
-#define IS_FULLSCREEN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FULLSCREEN_WINDOW))
-#define FULLSCREEN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FULLSCREEN_WINDOW, FullscreenWindowClass))
-
-typedef struct _FullscreenWindow FullscreenWindow;
-typedef struct _FullscreenWindowClass FullscreenWindowClass;
-
-#define TYPE_INJECTION_GROUP (injection_group_get_type ())
-#define INJECTION_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INJECTION_GROUP, InjectionGroup))
-#define INJECTION_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_INJECTION_GROUP, InjectionGroupClass))
-#define IS_INJECTION_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_INJECTION_GROUP))
-#define IS_INJECTION_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_INJECTION_GROUP))
-#define INJECTION_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_INJECTION_GROUP, InjectionGroupClass))
-
-typedef struct _InjectionGroup InjectionGroup;
-typedef struct _InjectionGroupClass InjectionGroupClass;
-typedef struct _CheckerboardPagePrivate CheckerboardPagePrivate;
-
-#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_VIEW (data_view_get_type ())
-#define DATA_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_VIEW, DataView))
-#define DATA_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_VIEW, DataViewClass))
-#define IS_DATA_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_VIEW))
-#define IS_DATA_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_VIEW))
-#define DATA_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_VIEW, DataViewClass))
-
-typedef struct _DataView DataView;
-typedef struct _DataViewClass DataViewClass;
-
-#define TYPE_THUMBNAIL_VIEW (thumbnail_view_get_type ())
-#define THUMBNAIL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_THUMBNAIL_VIEW, ThumbnailView))
-#define THUMBNAIL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_THUMBNAIL_VIEW, ThumbnailViewClass))
-#define IS_THUMBNAIL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_THUMBNAIL_VIEW))
-#define IS_THUMBNAIL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_THUMBNAIL_VIEW))
-#define THUMBNAIL_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_THUMBNAIL_VIEW, ThumbnailViewClass))
-
-typedef struct _ThumbnailView ThumbnailView;
-typedef struct _ThumbnailViewClass ThumbnailViewClass;
-
-#define TYPE_CHECKERBOARD_ITEM (checkerboard_item_get_type ())
-#define CHECKERBOARD_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_ITEM, CheckerboardItem))
-#define CHECKERBOARD_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CHECKERBOARD_ITEM, CheckerboardItemClass))
-#define IS_CHECKERBOARD_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CHECKERBOARD_ITEM))
-#define IS_CHECKERBOARD_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CHECKERBOARD_ITEM))
-#define CHECKERBOARD_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CHECKERBOARD_ITEM, CheckerboardItemClass))
-
-typedef struct _CheckerboardItem CheckerboardItem;
-typedef struct _CheckerboardItemClass CheckerboardItemClass;
-
-#define CHECKERBOARD_PAGE_TYPE_ACTIVATOR (checkerboard_page_activator_get_type ())
-
-#define CHECKERBOARD_PAGE_TYPE_KEYBOARD_MODIFIERS (checkerboard_page_keyboard_modifiers_get_type ())
-typedef struct _CheckerboardPageKeyboardModifiers CheckerboardPageKeyboardModifiers;
-
-#define TYPE_VIEW_FILTER (view_filter_get_type ())
-#define VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_FILTER, ViewFilter))
-#define VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_FILTER, ViewFilterClass))
-#define IS_VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIEW_FILTER))
-#define IS_VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIEW_FILTER))
-#define VIEW_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIEW_FILTER, ViewFilterClass))
-
-typedef struct _ViewFilter ViewFilter;
-typedef struct _ViewFilterClass ViewFilterClass;
-
-#define TYPE_SEARCH_VIEW_FILTER (search_view_filter_get_type ())
-#define SEARCH_VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_VIEW_FILTER, SearchViewFilter))
-#define SEARCH_VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_VIEW_FILTER, SearchViewFilterClass))
-#define IS_SEARCH_VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_VIEW_FILTER))
-#define IS_SEARCH_VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_VIEW_FILTER))
-#define SEARCH_VIEW_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_VIEW_FILTER, SearchViewFilterClass))
-
-typedef struct _SearchViewFilter SearchViewFilter;
-typedef struct _SearchViewFilterClass SearchViewFilterClass;
-
-#define CORE_TYPE_TRACKER (core_tracker_get_type ())
-#define CORE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_TRACKER, CoreTracker))
-#define CORE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CORE_TYPE_TRACKER, CoreTrackerClass))
-#define CORE_IS_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CORE_TYPE_TRACKER))
-#define CORE_IS_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CORE_TYPE_TRACKER))
-#define CORE_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CORE_TYPE_TRACKER, CoreTrackerClass))
-
-typedef struct _CoreTracker CoreTracker;
-typedef struct _CoreTrackerClass CoreTrackerClass;
-
-#define CORE_TYPE_VIEW_TRACKER (core_view_tracker_get_type ())
-#define CORE_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTracker))
-#define CORE_VIEW_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerClass))
-#define CORE_IS_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CORE_TYPE_VIEW_TRACKER))
-#define CORE_IS_VIEW_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CORE_TYPE_VIEW_TRACKER))
-#define CORE_VIEW_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerClass))
-
-typedef struct _CoreViewTracker CoreViewTracker;
-typedef struct _CoreViewTrackerClass CoreViewTrackerClass;
-typedef struct _MediaPagePrivate MediaPagePrivate;
-
-#define TYPE_RATING (rating_get_type ())
-
-#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
-
-#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;
-typedef struct _CollectionPagePrivate CollectionPagePrivate;
-typedef struct _LibraryMainPagePrivate LibraryMainPagePrivate;
-
-#define TYPE_DATA_COLLECTION (data_collection_get_type ())
-#define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
-#define DATA_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_COLLECTION, DataCollectionClass))
-#define IS_DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_COLLECTION))
-#define IS_DATA_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_COLLECTION))
-#define DATA_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_COLLECTION, DataCollectionClass))
-
-typedef struct _DataCollection DataCollection;
-typedef struct _DataCollectionClass DataCollectionClass;
-
-#define TYPE_SOURCE_COLLECTION (source_collection_get_type ())
-#define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection))
-#define SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SOURCE_COLLECTION, SourceCollectionClass))
-#define IS_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SOURCE_COLLECTION))
-#define IS_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SOURCE_COLLECTION))
-#define SOURCE_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SOURCE_COLLECTION, SourceCollectionClass))
-
-typedef struct _SourceCollection SourceCollection;
-typedef struct _SourceCollectionClass SourceCollectionClass;
-
-#define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ())
-#define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection))
-#define DATABASE_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollectionClass))
-#define IS_DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_SOURCE_COLLECTION))
-#define IS_DATABASE_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_SOURCE_COLLECTION))
-#define DATABASE_SOURCE_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollectionClass))
-
-typedef struct _DatabaseSourceCollection DatabaseSourceCollection;
-typedef struct _DatabaseSourceCollectionClass DatabaseSourceCollectionClass;
-
-#define TYPE_MEDIA_SOURCE_COLLECTION (media_source_collection_get_type ())
-#define MEDIA_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection))
-#define MEDIA_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollectionClass))
-#define IS_MEDIA_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_SOURCE_COLLECTION))
-#define IS_MEDIA_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_SOURCE_COLLECTION))
-#define MEDIA_SOURCE_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollectionClass))
-
-typedef struct _MediaSourceCollection MediaSourceCollection;
-typedef struct _MediaSourceCollectionClass MediaSourceCollectionClass;
-
-#define TYPE_MEDIA_COLLECTION_REGISTRY (media_collection_registry_get_type ())
-#define MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry))
-#define MEDIA_COLLECTION_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistryClass))
-#define IS_MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_COLLECTION_REGISTRY))
-#define IS_MEDIA_COLLECTION_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_COLLECTION_REGISTRY))
-#define MEDIA_COLLECTION_REGISTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistryClass))
-
-typedef struct _MediaCollectionRegistry MediaCollectionRegistry;
-typedef struct _MediaCollectionRegistryClass MediaCollectionRegistryClass;
-#define _media_collection_registry_unref0(var) ((var == NULL) ? NULL : (var = (media_collection_registry_unref (var), NULL)))
-
-#define TYPE_VIEW_COLLECTION (view_collection_get_type ())
-#define VIEW_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_COLLECTION, ViewCollection))
-#define VIEW_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_COLLECTION, ViewCollectionClass))
-#define IS_VIEW_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIEW_COLLECTION))
-#define IS_VIEW_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIEW_COLLECTION))
-#define VIEW_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIEW_COLLECTION, ViewCollectionClass))
-
-typedef struct _ViewCollection ViewCollection;
-typedef struct _ViewCollectionClass ViewCollectionClass;
-
-#define TYPE_VIEW_MANAGER (view_manager_get_type ())
-#define VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_MANAGER, ViewManager))
-#define VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_MANAGER, ViewManagerClass))
-#define IS_VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIEW_MANAGER))
-#define IS_VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIEW_MANAGER))
-#define VIEW_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIEW_MANAGER, ViewManagerClass))
-
-typedef struct _ViewManager ViewManager;
-typedef struct _ViewManagerClass ViewManagerClass;
-
-#define TYPE_ALTERATION (alteration_get_type ())
-#define ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALTERATION, Alteration))
-#define ALTERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ALTERATION, AlterationClass))
-#define IS_ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ALTERATION))
-#define IS_ALTERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ALTERATION))
-#define ALTERATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ALTERATION, AlterationClass))
-
-typedef struct _Alteration Alteration;
-typedef struct _AlterationClass AlterationClass;
-
-#define VIEW_COLLECTION_TYPE_MONITOR (view_collection_monitor_get_type ())
-#define VIEW_COLLECTION_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor))
-#define VIEW_COLLECTION_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitorClass))
-#define VIEW_COLLECTION_IS_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIEW_COLLECTION_TYPE_MONITOR))
-#define VIEW_COLLECTION_IS_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIEW_COLLECTION_TYPE_MONITOR))
-#define VIEW_COLLECTION_MONITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitorClass))
-
-typedef struct _ViewCollectionMonitor ViewCollectionMonitor;
-typedef struct _ViewCollectionMonitorClass ViewCollectionMonitorClass;
-
-#define TYPE_COLLECTION_VIEW_MANAGER (collection_view_manager_get_type ())
-#define COLLECTION_VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager))
-#define COLLECTION_VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManagerClass))
-#define IS_COLLECTION_VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COLLECTION_VIEW_MANAGER))
-#define IS_COLLECTION_VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COLLECTION_VIEW_MANAGER))
-#define COLLECTION_VIEW_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManagerClass))
-
-typedef struct _CollectionViewManager CollectionViewManager;
-typedef struct _CollectionViewManagerClass CollectionViewManagerClass;
-#define _view_collection_monitor_unref0(var) ((var == NULL) ? NULL : (var = (view_collection_monitor_unref (var), NULL)))
-#define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
-#define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
-
-#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
-#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
-#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
-#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
-#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-
-typedef struct _ConfigurationFacade ConfigurationFacade;
-typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
-
-#define CONFIG_TYPE_FACADE (config_facade_get_type ())
-#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
-#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
-#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
-#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-
-typedef struct _ConfigFacade ConfigFacade;
-typedef struct _ConfigFacadeClass ConfigFacadeClass;
-
-struct _SidebarBranch {
-	GObject parent_instance;
-	SidebarBranchPrivate * priv;
-};
-
-struct _SidebarBranchClass {
-	GObjectClass parent_class;
-};
-
-struct _LibraryBranch {
-	SidebarBranch parent_instance;
-	LibraryBranchPrivate * priv;
-};
-
-struct _LibraryBranchClass {
-	SidebarBranchClass parent_class;
-};
-
-struct _LibraryBranchPrivate {
-	LibraryPhotosEntry* _photos_entry;
-	LibraryFlaggedSidebarEntry* _flagged_entry;
-	LibraryLastImportSidebarEntry* _last_imported_entry;
-	LibraryImportQueueSidebarEntry* _import_queue_entry;
-	LibraryOfflineSidebarEntry* _offline_entry;
-	LibraryTrashSidebarEntry* _trash_entry;
-};
-
-typedef enum  {
-	LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS,
-	LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED,
-	LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED,
-	LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE,
-	LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE,
-	LIBRARY_BRANCH_ENTRY_POSITION_TRASH
-} LibraryBranchEntryPosition;
-
-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 _SidebarSelectableEntryIface {
-	GTypeInterface parent_iface;
-};
-
-struct _SidebarPageRepresentativeIface {
-	GTypeInterface parent_iface;
-	gboolean (*has_page) (SidebarPageRepresentative* self);
-	Page* (*get_page) (SidebarPageRepresentative* self);
-};
-
-struct _SidebarContextableIface {
-	GTypeInterface parent_iface;
-	GtkMenu* (*get_sidebar_context_menu) (SidebarContextable* self, GdkEventButton* event);
-};
-
-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 _LibraryPhotosEntry {
-	SidebarSimplePageEntry parent_instance;
-	LibraryPhotosEntryPrivate * priv;
-};
-
-struct _LibraryPhotosEntryClass {
-	SidebarSimplePageEntryClass parent_class;
-};
-
-typedef gboolean (*ProgressMonitor) (guint64 current, guint64 total, gboolean do_event_loop, void* user_data);
-struct _LibraryHideablePageEntry {
-	SidebarSimplePageEntry parent_instance;
-	LibraryHideablePageEntryPrivate * priv;
-};
-
-struct _LibraryHideablePageEntryClass {
-	SidebarSimplePageEntryClass parent_class;
-};
-
-struct _LibraryHideablePageEntryPrivate {
-	gboolean show_entry;
-};
-
-struct _Page {
-	GtkScrolledWindow parent_instance;
-	PagePrivate * priv;
-	GtkBuilder* builder;
-	GtkToolbar* toolbar;
-	gboolean in_view;
-};
-
-struct _PageClass {
-	GtkScrolledWindowClass parent_class;
-	void (*set_page_name) (Page* self, const gchar* page_name);
-	void (*set_container) (Page* self, GtkWindow* container);
-	void (*clear_container) (Page* self);
-	GtkToolbar* (*get_toolbar) (Page* self);
-	GtkMenu* (*get_page_context_menu) (Page* self);
-	void (*switching_from) (Page* self);
-	void (*switched_to) (Page* self);
-	void (*ready) (Page* self);
-	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
-	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
-	void (*add_actions) (Page* self, GActionMap* map);
-	void (*remove_actions) (Page* self, GActionMap* map);
-	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
-	void (*init_actions) (Page* self, gint selected_count, gint count);
-	void (*update_actions) (Page* self, gint selected_count, gint count);
-	gboolean (*source_drag_failed) (Page* self, GdkDragContext* context, GtkDragResult drag_result);
-	gboolean (*on_left_click) (Page* self, GdkEventButton* event);
-	gboolean (*on_middle_click) (Page* self, GdkEventButton* event);
-	gboolean (*on_right_click) (Page* self, GdkEventButton* event);
-	gboolean (*on_left_released) (Page* self, GdkEventButton* event);
-	gboolean (*on_middle_released) (Page* self, GdkEventButton* event);
-	gboolean (*on_right_released) (Page* self, GdkEventButton* event);
-	gboolean (*on_ctrl_pressed) (Page* self, GdkEventKey* event);
-	gboolean (*on_ctrl_released) (Page* self, GdkEventKey* event);
-	gboolean (*on_alt_pressed) (Page* self, GdkEventKey* event);
-	gboolean (*on_alt_released) (Page* self, GdkEventKey* event);
-	gboolean (*on_shift_pressed) (Page* self, GdkEventKey* event);
-	gboolean (*on_shift_released) (Page* self, GdkEventKey* event);
-	gboolean (*on_super_pressed) (Page* self, GdkEventKey* event);
-	gboolean (*on_super_released) (Page* self, GdkEventKey* event);
-	gboolean (*on_app_key_pressed) (Page* self, GdkEventKey* event);
-	gboolean (*on_app_key_released) (Page* self, GdkEventKey* event);
-	void (*on_move) (Page* self, GdkRectangle* rect);
-	void (*on_move_start) (Page* self, GdkRectangle* rect);
-	void (*on_move_finished) (Page* self, GdkRectangle* rect);
-	void (*on_resize) (Page* self, GdkRectangle* rect);
-	void (*on_resize_start) (Page* self, GdkRectangle* rect);
-	void (*on_resize_finished) (Page* self, GdkRectangle* rect);
-	gboolean (*on_configure) (Page* self, GdkEventConfigure* event, GdkRectangle* rect);
-	gboolean (*on_motion) (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask);
-	gboolean (*on_leave_notify_event) (Page* self);
-	gboolean (*on_mousewheel_up) (Page* self, GdkEventScroll* event);
-	gboolean (*on_mousewheel_down) (Page* self, GdkEventScroll* event);
-	gboolean (*on_mousewheel_left) (Page* self, GdkEventScroll* event);
-	gboolean (*on_mousewheel_right) (Page* self, GdkEventScroll* event);
-	gboolean (*on_context_keypress) (Page* self);
-	gboolean (*on_context_buttonpress) (Page* self, GdkEventButton* event);
-	gboolean (*on_context_invoked) (Page* self);
-	void (*set_page_cursor) (Page* self, GdkCursorType cursor_type);
-};
-
-typedef enum  {
-	CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD,
-	CHECKERBOARD_PAGE_ACTIVATOR_MOUSE
-} CheckerboardPageActivator;
-
-struct _CheckerboardPageKeyboardModifiers {
-	gboolean ctrl_pressed;
-	gboolean alt_pressed;
-	gboolean shift_pressed;
-	gboolean super_pressed;
-};
-
-struct _CheckerboardPage {
-	Page parent_instance;
-	CheckerboardPagePrivate * priv;
-	CheckerboardItem* anchor;
-	CheckerboardItem* cursor;
-};
-
-struct _CheckerboardPageClass {
-	PageClass parent_class;
-	GtkMenu* (*get_item_context_menu) (CheckerboardPage* self);
-	gchar* (*get_view_empty_message) (CheckerboardPage* self);
-	gchar* (*get_filter_no_match_message) (CheckerboardPage* self);
-	void (*on_item_activated) (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers);
-	SearchViewFilter* (*get_search_view_filter) (CheckerboardPage* self);
-	CoreViewTracker* (*get_view_tracker) (CheckerboardPage* self);
-	gboolean (*on_mouse_over) (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask);
-	void (*set_display_titles) (CheckerboardPage* self, gboolean display);
-	void (*set_display_comments) (CheckerboardPage* self, gboolean display);
-};
-
-typedef enum  {
-	RATING_REJECTED = -1,
-	RATING_UNRATED = 0,
-	RATING_ONE = 1,
-	RATING_TWO = 2,
-	RATING_THREE = 3,
-	RATING_FOUR = 4,
-	RATING_FIVE = 5
-} Rating;
-
-typedef enum  {
-	RAW_DEVELOPER_SHOTWELL = 0,
-	RAW_DEVELOPER_CAMERA,
-	RAW_DEVELOPER_EMBEDDED
-} RawDeveloper;
-
-struct _MediaPage {
-	CheckerboardPage parent_instance;
-	MediaPagePrivate * priv;
-};
-
-struct _MediaPageClass {
-	CheckerboardPageClass parent_class;
-	void (*on_zoom_changed) (MediaPage* self);
-	void (*on_export) (MediaPage* self);
-	void (*on_increase_size) (MediaPage* self);
-	void (*on_decrease_size) (MediaPage* self);
-	void (*on_increase_rating) (MediaPage* self);
-	void (*on_decrease_rating) (MediaPage* self);
-	void (*on_set_rating) (MediaPage* self, Rating rating);
-	void (*on_rate_rejected) (MediaPage* self);
-	void (*on_rate_unrated) (MediaPage* self);
-	void (*on_rate_one) (MediaPage* self);
-	void (*on_rate_two) (MediaPage* self);
-	void (*on_rate_three) (MediaPage* self);
-	void (*on_rate_four) (MediaPage* self);
-	void (*on_rate_five) (MediaPage* self);
-	void (*on_move_to_trash) (MediaPage* self);
-	void (*on_edit_title) (MediaPage* self);
-	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
-	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
-	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
-	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
-	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
-	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
-	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
-	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
-};
-
-struct _CollectionPage {
-	MediaPage parent_instance;
-	CollectionPagePrivate * priv;
-};
-
-struct _CollectionPageClass {
-	MediaPageClass parent_class;
-};
-
-struct _LibraryMainPage {
-	CollectionPage parent_instance;
-	LibraryMainPagePrivate * priv;
-};
-
-struct _LibraryMainPageClass {
-	CollectionPageClass parent_class;
-};
-
-
-static gpointer library_branch_parent_class = NULL;
-static gpointer library_photos_entry_parent_class = NULL;
-static gpointer library_hideable_page_entry_parent_class = NULL;
-static gpointer library_main_page_parent_class = NULL;
-
-GType sidebar_branch_get_type (void) G_GNUC_CONST;
-GType library_branch_get_type (void) G_GNUC_CONST;
-GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
-GType library_photos_entry_get_type (void) G_GNUC_CONST;
-GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
-GType library_flagged_sidebar_entry_get_type (void) G_GNUC_CONST;
-GType library_last_import_sidebar_entry_get_type (void) G_GNUC_CONST;
-GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST;
-GType library_offline_sidebar_entry_get_type (void) G_GNUC_CONST;
-GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST;
-#define LIBRARY_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_BRANCH, LibraryBranchPrivate))
-enum  {
-	LIBRARY_BRANCH_DUMMY_PROPERTY,
-	LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY
-};
-static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-#define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position"
-LibraryBranch* library_branch_new (void);
-LibraryBranch* library_branch_construct (GType object_type);
-SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
-SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
-GType sidebar_grouping_get_type (void) G_GNUC_CONST;
-GType sidebar_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 library_branch_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _library_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);
-LibraryPhotosEntry* library_photos_entry_new (void);
-LibraryPhotosEntry* library_photos_entry_construct (GType object_type);
-static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value);
-LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void);
-LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type);
-static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value);
-LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void);
-LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type);
-static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value);
-LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void);
-LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type);
-static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value);
-LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void);
-LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type);
-static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value);
-LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void);
-LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type);
-static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value);
-static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position);
-LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self);
-LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self);
-LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self);
-static void library_branch_on_flagged_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
-LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self);
-static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
-LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self);
-static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
-LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self);
-static void library_branch_on_offline_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
-SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
-static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position);
-gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self);
-gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void library_branch_finalize (GObject * obj);
-static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-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_contextable_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_PHOTOS_ENTRY_DUMMY_PROPERTY
-};
-SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
-static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
-static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
-#define RESOURCES_ICON_PHOTOS "shotwell"
-static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base);
-LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target);
-LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target);
-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 library_main_page_get_type (void) G_GNUC_CONST;
-#define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryPrivate))
-enum  {
-	LIBRARY_HIDEABLE_PAGE_ENTRY_DUMMY_PROPERTY,
-	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY
-};
-LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
-static void library_hideable_page_entry_finalize (GObject * obj);
-static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
-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);
-gpointer value_get_injection_group (const GValue* value);
-GType injection_group_get_type (void) G_GNUC_CONST;
-GType data_object_get_type (void) G_GNUC_CONST;
-GType data_view_get_type (void) G_GNUC_CONST;
-GType thumbnail_view_get_type (void) G_GNUC_CONST;
-GType checkerboard_item_get_type (void) G_GNUC_CONST;
-GType checkerboard_page_activator_get_type (void) G_GNUC_CONST;
-GType checkerboard_page_keyboard_modifiers_get_type (void) G_GNUC_CONST;
-CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self);
-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);
-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);
-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;
-GType data_source_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_MAIN_PAGE_DUMMY_PROPERTY
-};
-#define LIBRARY_MAIN_PAGE_NAME _ ("Library")
-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);
-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 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);
-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);
-GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
-GType view_collection_get_type (void) G_GNUC_CONST;
-ViewCollection* page_get_view (Page* self);
-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);
-gpointer value_get_view_manager (const GValue* value);
-GType view_manager_get_type (void) G_GNUC_CONST;
-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);
-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);
-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);
-CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
-GType collection_view_manager_get_type (void) G_GNUC_CONST;
-static void library_main_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 library_main_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 GType library_branch_entry_position_get_type (void) {
-	static volatile gsize library_branch_entry_position_type_id__volatile = 0;
-	if (g_once_init_enter (&library_branch_entry_position_type_id__volatile)) {
-		static const GEnumValue values[] = {{LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS, "LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS", "photos"}, {LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED, "LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED", "flagged"}, {LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED, "LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED", "last-imported"}, {LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE, "LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE", "import-queue"}, {LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE, "LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE", "offline"}, {LIBRARY_BRANCH_ENTRY_POSITION_TRASH, "LIBRARY_BRANCH_ENTRY_POSITION_TRASH", "trash"}, {0, NULL, NULL}};
-		GType library_branch_entry_position_type_id;
-		library_branch_entry_position_type_id = g_enum_register_static ("LibraryBranchEntryPosition", values);
-		g_once_init_leave (&library_branch_entry_position_type_id__volatile, library_branch_entry_position_type_id);
-	}
-	return library_branch_entry_position_type_id__volatile;
-}
-
-
-static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
-	gint result;
-	result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1000 "Branch.c"
-}
-
-
-static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
-#line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
-#line 1007 "Branch.c"
-}
-
-
-static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
-#line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
-#line 1014 "Branch.c"
-}
-
-
-static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
-#line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
-#line 1021 "Branch.c"
-}
-
-
-static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
-#line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
-#line 1028 "Branch.c"
-}
-
-
-LibraryBranch* library_branch_construct (GType object_type) {
-	LibraryBranch * self = NULL;
-	SidebarHeader* _tmp0_;
-	SidebarHeader* _tmp1_;
-	LibraryPhotosEntry* _tmp2_;
-	LibraryPhotosEntry* _tmp3_;
-	LibraryTrashSidebarEntry* _tmp4_;
-	LibraryTrashSidebarEntry* _tmp5_;
-	LibraryLastImportSidebarEntry* _tmp6_;
-	LibraryLastImportSidebarEntry* _tmp7_;
-	LibraryFlaggedSidebarEntry* _tmp8_;
-	LibraryFlaggedSidebarEntry* _tmp9_;
-	LibraryOfflineSidebarEntry* _tmp10_;
-	LibraryOfflineSidebarEntry* _tmp11_;
-	LibraryImportQueueSidebarEntry* _tmp12_;
-	LibraryImportQueueSidebarEntry* _tmp13_;
-	LibraryPhotosEntry* _tmp14_;
-	LibraryTrashSidebarEntry* _tmp15_;
-	LibraryFlaggedSidebarEntry* _tmp16_;
-	LibraryLastImportSidebarEntry* _tmp17_;
-	LibraryImportQueueSidebarEntry* _tmp18_;
-	LibraryOfflineSidebarEntry* _tmp19_;
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = sidebar_header_new (_ ("Library"), TRUE);
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _tmp0_;
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL);
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = library_photos_entry_new ();
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp3_ = _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_photos_entry (self, _tmp3_);
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp3_);
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp4_ = library_trash_sidebar_entry_new ();
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp5_ = _tmp4_;
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_trash_entry (self, _tmp5_);
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp5_);
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp6_ = library_last_import_sidebar_entry_new ();
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp7_ = _tmp6_;
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_last_imported_entry (self, _tmp7_);
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp8_ = library_flagged_sidebar_entry_new ();
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp9_ = _tmp8_;
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_flagged_entry (self, _tmp9_);
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp9_);
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp10_ = library_offline_sidebar_entry_new ();
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp11_ = _tmp10_;
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_offline_entry (self, _tmp11_);
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp11_);
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp12_ = library_import_queue_sidebar_entry_new ();
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp13_ = _tmp12_;
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_import_queue_entry (self, _tmp13_);
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp13_);
-#line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp14_ = self->priv->_photos_entry;
-#line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS);
-#line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp15_ = self->priv->_trash_entry;
-#line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH);
-#line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp16_ = self->priv->_flagged_entry;
-#line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 44 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_flagged_visibility_changed (self);
-#line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp17_ = self->priv->_last_imported_entry;
-#line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 47 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_last_imported_visibility_changed (self);
-#line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp18_ = self->priv->_import_queue_entry;
-#line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 50 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_import_queue_visibility_changed (self);
-#line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp19_ = self->priv->_offline_entry;
-#line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
-#line 53 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_on_offline_visibility_changed (self);
-#line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return self;
-#line 1144 "Branch.c"
-}
-
-
-LibraryBranch* library_branch_new (void) {
-#line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return library_branch_construct (LIBRARY_TYPE_BRANCH);
-#line 1151 "Branch.c"
-}
-
-
-static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position) {
-	SidebarEntry* _tmp0_;
-	gint _tmp1_;
-	SidebarEntry* _tmp2_;
-	SidebarEntry* _tmp3_;
-	SidebarEntry* _tmp4_;
-#line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = entry;
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = position;
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_set_data_full (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA, (gpointer) ((gintptr) _tmp1_), NULL);
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp3_ = _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp4_ = entry;
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL);
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1181 "Branch.c"
-}
-
-
-static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
-	LibraryFlaggedSidebarEntry* _tmp0_;
-#line 61 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_flagged_entry;
-#line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED);
-#line 1193 "Branch.c"
-}
-
-
-static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) {
-	LibraryLastImportSidebarEntry* _tmp0_;
-#line 65 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_last_imported_entry;
-#line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED);
-#line 1205 "Branch.c"
-}
-
-
-static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) {
-	LibraryImportQueueSidebarEntry* _tmp0_;
-#line 69 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_import_queue_entry;
-#line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE);
-#line 1217 "Branch.c"
-}
-
-
-static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
-	LibraryOfflineSidebarEntry* _tmp0_;
-#line 73 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_offline_entry;
-#line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE);
-#line 1229 "Branch.c"
-}
-
-
-static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position) {
-	LibraryHideablePageEntry* _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-#line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (entry));
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = entry;
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = library_hideable_page_entry_get_visible (_tmp0_);
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (_tmp2_) {
-#line 1249 "Branch.c"
-		LibraryHideablePageEntry* _tmp3_;
-		gboolean _tmp4_;
-#line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp3_ = entry;
-#line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		if (!_tmp4_) {
-#line 1258 "Branch.c"
-			LibraryHideablePageEntry* _tmp5_;
-			gint _tmp6_;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp5_ = entry;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp6_ = position;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_);
-#line 1267 "Branch.c"
-		}
-	} else {
-		LibraryHideablePageEntry* _tmp7_;
-		gboolean _tmp8_;
-#line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp7_ = entry;
-#line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		if (_tmp8_) {
-#line 1278 "Branch.c"
-			LibraryHideablePageEntry* _tmp9_;
-#line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp9_ = entry;
-#line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1284 "Branch.c"
-		}
-	}
-}
-
-
-static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
-	gint result = 0;
-	SidebarEntry* _tmp0_;
-	gconstpointer _tmp1_;
-	SidebarEntry* _tmp2_;
-	gconstpointer _tmp3_;
-#line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = a;
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = b;
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp3_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_));
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1312 "Branch.c"
-}
-
-
-LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
-	LibraryPhotosEntry* result;
-	LibraryPhotosEntry* _tmp0_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_photos_entry;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1327 "Branch.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1334 "Branch.c"
-}
-
-
-static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) {
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (library_branch_get_photos_entry (self) != value) {
-#line 1343 "Branch.c"
-		LibraryPhotosEntry* _tmp0_;
-		LibraryPhotosEntry* _tmp1_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp0_ = value;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (self->priv->_photos_entry);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		self->priv->_photos_entry = _tmp1_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_object_notify ((GObject *) self, "photos-entry");
-#line 1356 "Branch.c"
-	}
-}
-
-
-LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) {
-	LibraryFlaggedSidebarEntry* result;
-	LibraryFlaggedSidebarEntry* _tmp0_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_flagged_entry;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1372 "Branch.c"
-}
-
-
-static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) {
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (library_branch_get_flagged_entry (self) != value) {
-#line 1381 "Branch.c"
-		LibraryFlaggedSidebarEntry* _tmp0_;
-		LibraryFlaggedSidebarEntry* _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp0_ = value;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (self->priv->_flagged_entry);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		self->priv->_flagged_entry = _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_object_notify ((GObject *) self, "flagged-entry");
-#line 1394 "Branch.c"
-	}
-}
-
-
-LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) {
-	LibraryLastImportSidebarEntry* result;
-	LibraryLastImportSidebarEntry* _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_last_imported_entry;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1410 "Branch.c"
-}
-
-
-static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) {
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (library_branch_get_last_imported_entry (self) != value) {
-#line 1419 "Branch.c"
-		LibraryLastImportSidebarEntry* _tmp0_;
-		LibraryLastImportSidebarEntry* _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp0_ = value;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (self->priv->_last_imported_entry);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		self->priv->_last_imported_entry = _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_object_notify ((GObject *) self, "last-imported-entry");
-#line 1432 "Branch.c"
-	}
-}
-
-
-LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) {
-	LibraryImportQueueSidebarEntry* result;
-	LibraryImportQueueSidebarEntry* _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_import_queue_entry;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1448 "Branch.c"
-}
-
-
-static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) {
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (library_branch_get_import_queue_entry (self) != value) {
-#line 1457 "Branch.c"
-		LibraryImportQueueSidebarEntry* _tmp0_;
-		LibraryImportQueueSidebarEntry* _tmp1_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp0_ = value;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (self->priv->_import_queue_entry);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		self->priv->_import_queue_entry = _tmp1_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_object_notify ((GObject *) self, "import-queue-entry");
-#line 1470 "Branch.c"
-	}
-}
-
-
-LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) {
-	LibraryOfflineSidebarEntry* result;
-	LibraryOfflineSidebarEntry* _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_offline_entry;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1486 "Branch.c"
-}
-
-
-static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) {
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (library_branch_get_offline_entry (self) != value) {
-#line 1495 "Branch.c"
-		LibraryOfflineSidebarEntry* _tmp0_;
-		LibraryOfflineSidebarEntry* _tmp1_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp0_ = value;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (self->priv->_offline_entry);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		self->priv->_offline_entry = _tmp1_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_object_notify ((GObject *) self, "offline-entry");
-#line 1508 "Branch.c"
-	}
-}
-
-
-LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
-	LibraryTrashSidebarEntry* result;
-	LibraryTrashSidebarEntry* _tmp0_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->_trash_entry;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1524 "Branch.c"
-}
-
-
-static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) {
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_BRANCH (self));
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (library_branch_get_trash_entry (self) != value) {
-#line 1533 "Branch.c"
-		LibraryTrashSidebarEntry* _tmp0_;
-		LibraryTrashSidebarEntry* _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp0_ = value;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (self->priv->_trash_entry);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		self->priv->_trash_entry = _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_object_notify ((GObject *) self, "trash-entry");
-#line 1546 "Branch.c"
-	}
-}
-
-
-static void library_branch_class_init (LibraryBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_parent_class = g_type_class_peek_parent (klass);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_type_class_add_private (klass, sizeof (LibraryBranchPrivate));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (klass)->get_property = _vala_library_branch_get_property;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (klass)->set_property = _vala_library_branch_set_property;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (klass)->finalize = library_branch_finalize;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1574 "Branch.c"
-}
-
-
-static void library_branch_instance_init (LibraryBranch * self) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
-#line 1581 "Branch.c"
-}
-
-
-static void library_branch_finalize (GObject * obj) {
-	LibraryBranch * self;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_photos_entry);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_flagged_entry);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_last_imported_entry);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_import_queue_entry);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_offline_entry);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_trash_entry);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
-#line 1603 "Branch.c"
-}
-
-
-GType library_branch_get_type (void) {
-	static volatile gsize library_branch_type_id__volatile = 0;
-	if (g_once_init_enter (&library_branch_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (LibraryBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryBranch), 0, (GInstanceInitFunc) library_branch_instance_init, NULL };
-		GType library_branch_type_id;
-		library_branch_type_id = g_type_register_static (SIDEBAR_TYPE_BRANCH, "LibraryBranch", &g_define_type_info, 0);
-		g_once_init_leave (&library_branch_type_id__volatile, library_branch_type_id);
-	}
-	return library_branch_type_id__volatile;
-}
-
-
-static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
-	LibraryBranch * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	switch (property_id) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_value_set_object (value, library_branch_get_photos_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_value_set_object (value, library_branch_get_flagged_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_value_set_object (value, library_branch_get_last_imported_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_value_set_object (value, library_branch_get_import_queue_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_value_set_object (value, library_branch_get_offline_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_value_set_object (value, library_branch_get_trash_entry (self));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1660 "Branch.c"
-		default:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1666 "Branch.c"
-	}
-}
-
-
-static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
-	LibraryBranch * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	switch (property_id) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		library_branch_set_photos_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		library_branch_set_flagged_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		library_branch_set_last_imported_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		library_branch_set_import_queue_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		library_branch_set_offline_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		library_branch_set_trash_entry (self, g_value_get_object (value));
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1712 "Branch.c"
-		default:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1718 "Branch.c"
-	}
-}
-
-
-LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
-	LibraryPhotosEntry * self = NULL;
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return self;
-#line 1729 "Branch.c"
-}
-
-
-LibraryPhotosEntry* library_photos_entry_new (void) {
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
-#line 1736 "Branch.c"
-}
-
-
-static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
-	LibraryPhotosEntry * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 96 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = g_strdup (_ ("Photos"));
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1752 "Branch.c"
-}
-
-
-static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
-	LibraryPhotosEntry * self;
-	gchar* result = NULL;
-	gchar* _tmp0_;
-#line 100 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = g_strdup (RESOURCES_ICON_PHOTOS);
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1768 "Branch.c"
-}
-
-
-static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base) {
-	LibraryPhotosEntry * self;
-	Page* result = NULL;
-	LibraryMainPage* _tmp0_;
-#line 104 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = library_main_page_new (NULL, NULL);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_ref_sink (_tmp0_);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1786 "Branch.c"
-}
-
-
-static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_photos_entry_parent_class = g_type_class_peek_parent (klass);
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_name;
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon;
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page;
-#line 1799 "Branch.c"
-}
-
-
-static void library_photos_entry_instance_init (LibraryPhotosEntry * self) {
-}
-
-
-GType library_photos_entry_get_type (void) {
-	static volatile gsize library_photos_entry_type_id__volatile = 0;
-	if (g_once_init_enter (&library_photos_entry_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotosEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photos_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotosEntry), 0, (GInstanceInitFunc) library_photos_entry_instance_init, NULL };
-		GType library_photos_entry_type_id;
-		library_photos_entry_type_id = g_type_register_static (SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, "LibraryPhotosEntry", &g_define_type_info, 0);
-		g_once_init_leave (&library_photos_entry_type_id__volatile, library_photos_entry_type_id);
-	}
-	return library_photos_entry_type_id__volatile;
-}
-
-
-LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type) {
-	LibraryHideablePageEntry * self = NULL;
-#line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return self;
-#line 1825 "Branch.c"
-}
-
-
-gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) {
-	gboolean result;
-	gboolean _tmp0_;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_val_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self), FALSE);
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = self->priv->show_entry;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp0_;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return result;
-#line 1840 "Branch.c"
-}
-
-
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value) {
-	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
-#line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self));
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = self->priv->show_entry;
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (_tmp0_ == _tmp1_) {
-#line 118 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		return;
-#line 1859 "Branch.c"
-	}
-#line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = value;
-#line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->show_entry = _tmp2_;
-#line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp3_ = value;
-#line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
-#line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "visible");
-#line 1871 "Branch.c"
-}
-
-
-static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_hideable_page_entry_parent_class = g_type_class_peek_parent (klass);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_type_class_add_private (klass, sizeof (LibraryHideablePageEntryPrivate));
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (klass)->get_property = _vala_library_hideable_page_entry_get_property;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (klass)->set_property = _vala_library_hideable_page_entry_set_property;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1890 "Branch.c"
-}
-
-
-static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self);
-#line 113 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->show_entry = FALSE;
-#line 1899 "Branch.c"
-}
-
-
-static void library_hideable_page_entry_finalize (GObject * obj) {
-	LibraryHideablePageEntry * self;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
-#line 1909 "Branch.c"
-}
-
-
-GType library_hideable_page_entry_get_type (void) {
-	static volatile gsize library_hideable_page_entry_type_id__volatile = 0;
-	if (g_once_init_enter (&library_hideable_page_entry_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (LibraryHideablePageEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_hideable_page_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryHideablePageEntry), 0, (GInstanceInitFunc) library_hideable_page_entry_instance_init, NULL };
-		GType library_hideable_page_entry_type_id;
-		library_hideable_page_entry_type_id = g_type_register_static (SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, "LibraryHideablePageEntry", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
-		g_once_init_leave (&library_hideable_page_entry_type_id__volatile, library_hideable_page_entry_type_id);
-	}
-	return library_hideable_page_entry_type_id__volatile;
-}
-
-
-static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
-	LibraryHideablePageEntry * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	switch (property_id) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		g_value_set_boolean (value, library_hideable_page_entry_get_visible (self));
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1936 "Branch.c"
-		default:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1942 "Branch.c"
-	}
-}
-
-
-static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
-	LibraryHideablePageEntry * self;
-	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	switch (property_id) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		library_hideable_page_entry_set_visible (self, g_value_get_boolean (value));
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1958 "Branch.c"
-		default:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		break;
-#line 1964 "Branch.c"
-	}
-}
-
-
-LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target) {
-	LibraryMainPage * self = NULL;
-#line 133 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
-#line 1973 "Branch.c"
-	{
-		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_;
-		MediaCollectionRegistry* _tmp1_;
-		GeeCollection* _tmp2_;
-		GeeCollection* _tmp3_;
-		GeeIterator* _tmp4_;
-		GeeIterator* _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp0_ = media_collection_registry_get_instance ();
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp1_ = _tmp0_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp2_ = media_collection_registry_get_all (_tmp1_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp3_ = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_tmp5_ = _tmp4_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (_tmp3_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_media_collection_registry_unref0 (_tmp1_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_sources_it = _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		while (TRUE) {
-#line 2002 "Branch.c"
-			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
-			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			ViewCollection* _tmp10_;
-			ViewCollection* _tmp11_;
-			MediaSourceCollection* _tmp12_;
-			CollectionViewManager* _tmp13_;
-			CollectionViewManager* _tmp14_;
-			ProgressMonitor _tmp15_;
-			void* _tmp15__target;
-			ViewCollectionMonitor* _tmp16_;
-			ViewCollectionMonitor* _tmp17_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp6_ = _sources_it;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			if (!_tmp7_) {
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-				break;
-#line 2025 "Branch.c"
-			}
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp8_ = _sources_it;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			sources = (MediaSourceCollection*) _tmp9_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp11_ = _tmp10_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp12_ = sources;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp13_ = collection_view_manager_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp14_ = _tmp13_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp15_ = monitor;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp15__target = monitor_target;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp16_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, _tmp15_, _tmp15__target);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_tmp17_ = _tmp16_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_view_collection_monitor_unref0 (_tmp17_);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_view_manager_unref0 (_tmp14_);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_data_collection_unref0 (_tmp11_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-			_data_collection_unref0 (sources);
-#line 2059 "Branch.c"
-		}
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		_g_object_unref0 (_sources_it);
-#line 2063 "Branch.c"
-	}
-#line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return self;
-#line 2067 "Branch.c"
-}
-
-
-LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
-#line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
-#line 2074 "Branch.c"
-}
-
-
-static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
-	LibraryMainPage * self;
-	gboolean _vala_sort_order = FALSE;
-	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_;
-	ConfigFacade* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = config_facade_get_instance ();
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _tmp0_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	configuration_facade_get_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_vala_sort_order = _tmp2_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_vala_sort_by = _tmp3_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp1_);
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (sort_order) {
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		*sort_order = _vala_sort_order;
-#line 2104 "Branch.c"
-	}
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	if (sort_by) {
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		*sort_by = _vala_sort_by;
-#line 2110 "Branch.c"
-	}
-}
-
-
-static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
-	LibraryMainPage * self;
-	ConfigFacade* _tmp0_;
-	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
-#line 143 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = config_facade_get_instance ();
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _tmp0_;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = sort_order;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp3_ = sort_by;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp1_);
-#line 2135 "Branch.c"
-}
-
-
-static void library_main_page_class_init (LibraryMainPageClass * klass) {
-#line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_main_page_parent_class = g_type_class_peek_parent (klass);
-#line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
-#line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort;
-#line 2146 "Branch.c"
-}
-
-
-static void library_main_page_instance_init (LibraryMainPage * self) {
-}
-
-
-GType library_main_page_get_type (void) {
-	static volatile gsize library_main_page_type_id__volatile = 0;
-	if (g_once_init_enter (&library_main_page_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (LibraryMainPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_main_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMainPage), 0, (GInstanceInitFunc) library_main_page_instance_init, NULL };
-		GType library_main_page_type_id;
-		library_main_page_type_id = g_type_register_static (TYPE_COLLECTION_PAGE, "LibraryMainPage", &g_define_type_info, 0);
-		g_once_init_leave (&library_main_page_type_id__volatile, library_main_page_type_id);
-	}
-	return library_main_page_type_id__volatile;
-}
-
-
-
diff --git a/src/library/Branch.vala b/src/library/Branch.vala
deleted file mode 100644
index bab17fc..0000000
--- a/src/library/Branch.vala
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-public class Library.Branch : Sidebar.Branch {
-    private const string POSITION_DATA = "x-photos-entry-position";
-
-    public Library.PhotosEntry photos_entry { get; private set; }
-    public Library.FlaggedSidebarEntry flagged_entry { get; private set; }
-    public Library.LastImportSidebarEntry last_imported_entry { get; private set; }
-    public Library.ImportQueueSidebarEntry import_queue_entry { get; private set; }
-    public Library.OfflineSidebarEntry offline_entry { get; private set; }
-    public Library.TrashSidebarEntry trash_entry { get; private set; }
-    
-    // This lists the order of the library items in the sidebar. To re-order, simply move
-    // the item in this list to a new position. These numbers should *not* persist anywhere
-    // outside the app.
-    private enum EntryPosition {
-        PHOTOS,
-        FLAGGED,
-        LAST_IMPORTED,
-        IMPORT_QUEUE,
-        OFFLINE,
-        TRASH
-    }
-    
-    public Branch() {
-        base(new Sidebar.Header(_("Library")),
-            Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
-
-        photos_entry = new Library.PhotosEntry();
-        trash_entry = new Library.TrashSidebarEntry();
-        last_imported_entry = new Library.LastImportSidebarEntry();
-        flagged_entry = new Library.FlaggedSidebarEntry();
-        offline_entry = new Library.OfflineSidebarEntry();
-        import_queue_entry = new Library.ImportQueueSidebarEntry();
-
-        insert(photos_entry, EntryPosition.PHOTOS);
-        insert(trash_entry, EntryPosition.TRASH);
-
-        flagged_entry.visibility_changed.connect(on_flagged_visibility_changed);
-        on_flagged_visibility_changed();
-
-        last_imported_entry.visibility_changed.connect(on_last_imported_visibility_changed);
-        on_last_imported_visibility_changed();
-
-        import_queue_entry.visibility_changed.connect(on_import_queue_visibility_changed);
-        on_import_queue_visibility_changed();
-
-        offline_entry.visibility_changed.connect(on_offline_visibility_changed);
-        on_offline_visibility_changed();
-    }
-    
-    private void insert(Sidebar.Entry entry, int position) {
-        entry.set_data<int>(POSITION_DATA, position);
-        graft(get_root(), entry);
-    }
-
-    private void on_flagged_visibility_changed() {
-        update_entry_visibility(flagged_entry, EntryPosition.FLAGGED);
-    }
-
-    private void on_last_imported_visibility_changed() {
-        update_entry_visibility(last_imported_entry, EntryPosition.LAST_IMPORTED);
-    }
-
-    private void on_import_queue_visibility_changed() {
-        update_entry_visibility(import_queue_entry, EntryPosition.IMPORT_QUEUE);
-    }
-
-    private void on_offline_visibility_changed() {
-        update_entry_visibility(offline_entry, EntryPosition.OFFLINE);
-    }
-
-    private void update_entry_visibility(Library.HideablePageEntry entry, int position) {
-        if (entry.visible) {
-            if (!has_entry(entry))
-                insert(entry, position);
-        } else if (has_entry(entry)) {
-            prune(entry);
-        }
-    }
-
-    private static int comparator(Sidebar.Entry a, Sidebar.Entry b) {
-        return a.get_data<int>(POSITION_DATA) - b.get_data<int>(POSITION_DATA);
-    }
-}
-
-public class Library.PhotosEntry : Sidebar.SimplePageEntry {
-    
-    public PhotosEntry() {
-    }
-    
-    public override string get_sidebar_name() {
-        return _("Photos");
-    }
-    
-    public override string? get_sidebar_icon() {
-        return Resources.ICON_PHOTOS;
-    }
-    
-    protected override Page create_page() {
-        return new Library.MainPage();
-    }
-}
-
-public abstract class Library.HideablePageEntry : Sidebar.SimplePageEntry {
-    // container branch should listen to this signal
-    public signal void visibility_changed(bool visible);
-
-    private bool show_entry = false;
-    public bool visible {
-        get { return show_entry; }
-        set {
-            if (value == show_entry)
-                return;
-
-            show_entry = value;
-            visibility_changed(value);
-        }
-    }
-
-    public HideablePageEntry() {
-    }
-}
-
-public class Library.MainPage : CollectionPage {
-    public const string NAME = _("Library");
-    
-    public MainPage(ProgressMonitor? monitor = null) {
-        base (NAME);
-        
-        foreach (MediaSourceCollection sources in MediaCollectionRegistry.get_instance().get_all())
-            get_view().monitor_source_collection(sources, new CollectionViewManager(this), null, null, monitor);
-    }
-    
-    protected override void get_config_photos_sort(out bool sort_order, out int sort_by) {
-        Config.Facade.get_instance().get_library_photos_sort(out sort_order, out sort_by);
-    }
-
-    protected override void set_config_photos_sort(bool sort_order, int sort_by) {
-        Config.Facade.get_instance().set_library_photos_sort(sort_order, sort_by);
-    }
-}
-
diff --git a/src/library/LibraryBranch.c b/src/library/LibraryBranch.c
new file mode 100644
index 0000000..1cd27cb
--- /dev/null
+++ b/src/library/LibraryBranch.c
@@ -0,0 +1,2165 @@
+/* LibraryBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from LibraryBranch.vala, do not modify */
+
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gio/gio.h>
+#include <gee.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 LIBRARY_TYPE_BRANCH (library_branch_get_type ())
+#define LIBRARY_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_BRANCH, LibraryBranch))
+#define LIBRARY_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_BRANCH, LibraryBranchClass))
+#define LIBRARY_IS_BRANCH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_BRANCH))
+#define LIBRARY_IS_BRANCH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_BRANCH))
+#define LIBRARY_BRANCH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_BRANCH, LibraryBranchClass))
+
+typedef struct _LibraryBranch LibraryBranch;
+typedef struct _LibraryBranchClass LibraryBranchClass;
+typedef struct _LibraryBranchPrivate LibraryBranchPrivate;
+
+#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 LIBRARY_TYPE_PHOTOS_ENTRY (library_photos_entry_get_type ())
+#define LIBRARY_PHOTOS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry))
+#define LIBRARY_PHOTOS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntryClass))
+#define LIBRARY_IS_PHOTOS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_PHOTOS_ENTRY))
+#define LIBRARY_IS_PHOTOS_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_PHOTOS_ENTRY))
+#define LIBRARY_PHOTOS_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntryClass))
+
+typedef struct _LibraryPhotosEntry LibraryPhotosEntry;
+typedef struct _LibraryPhotosEntryClass LibraryPhotosEntryClass;
+
+#define LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY (library_hideable_page_entry_get_type ())
+#define LIBRARY_HIDEABLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry))
+#define LIBRARY_HIDEABLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryClass))
+#define LIBRARY_IS_HIDEABLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY))
+#define LIBRARY_IS_HIDEABLE_PAGE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY))
+#define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryClass))
+
+typedef struct _LibraryHideablePageEntry LibraryHideablePageEntry;
+typedef struct _LibraryHideablePageEntryClass LibraryHideablePageEntryClass;
+
+#define LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY (library_flagged_sidebar_entry_get_type ())
+#define LIBRARY_FLAGGED_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry))
+#define LIBRARY_FLAGGED_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntryClass))
+#define LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY))
+#define LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY))
+#define LIBRARY_FLAGGED_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntryClass))
+
+typedef struct _LibraryFlaggedSidebarEntry LibraryFlaggedSidebarEntry;
+typedef struct _LibraryFlaggedSidebarEntryClass LibraryFlaggedSidebarEntryClass;
+
+#define LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY (library_last_import_sidebar_entry_get_type ())
+#define LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry))
+#define LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntryClass))
+#define LIBRARY_IS_LAST_IMPORT_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY))
+#define LIBRARY_IS_LAST_IMPORT_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY))
+#define LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntryClass))
+
+typedef struct _LibraryLastImportSidebarEntry LibraryLastImportSidebarEntry;
+typedef struct _LibraryLastImportSidebarEntryClass LibraryLastImportSidebarEntryClass;
+
+#define LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY (library_import_queue_sidebar_entry_get_type ())
+#define LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntry))
+#define LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntryClass))
+#define LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY))
+#define LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY))
+#define LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, LibraryImportQueueSidebarEntryClass))
+
+typedef struct _LibraryImportQueueSidebarEntry LibraryImportQueueSidebarEntry;
+typedef struct _LibraryImportQueueSidebarEntryClass LibraryImportQueueSidebarEntryClass;
+
+#define LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY (library_offline_sidebar_entry_get_type ())
+#define LIBRARY_OFFLINE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry))
+#define LIBRARY_OFFLINE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntryClass))
+#define LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY))
+#define LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY))
+#define LIBRARY_OFFLINE_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntryClass))
+
+typedef struct _LibraryOfflineSidebarEntry LibraryOfflineSidebarEntry;
+typedef struct _LibraryOfflineSidebarEntryClass LibraryOfflineSidebarEntryClass;
+
+#define LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY (library_trash_sidebar_entry_get_type ())
+#define LIBRARY_TRASH_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry))
+#define LIBRARY_TRASH_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntryClass))
+#define LIBRARY_IS_TRASH_SIDEBAR_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY))
+#define LIBRARY_IS_TRASH_SIDEBAR_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY))
+#define LIBRARY_TRASH_SIDEBAR_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntryClass))
+
+typedef struct _LibraryTrashSidebarEntry LibraryTrashSidebarEntry;
+typedef struct _LibraryTrashSidebarEntryClass LibraryTrashSidebarEntryClass;
+
+#define LIBRARY_BRANCH_TYPE_ENTRY_POSITION (library_branch_entry_position_get_type ())
+#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 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_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;
+
+#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 _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
+typedef struct _LibraryPhotosEntryPrivate LibraryPhotosEntryPrivate;
+
+#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 LIBRARY_TYPE_MAIN_PAGE (library_main_page_get_type ())
+#define LIBRARY_MAIN_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage))
+#define LIBRARY_MAIN_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LIBRARY_TYPE_MAIN_PAGE, LibraryMainPageClass))
+#define LIBRARY_IS_MAIN_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LIBRARY_TYPE_MAIN_PAGE))
+#define LIBRARY_IS_MAIN_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LIBRARY_TYPE_MAIN_PAGE))
+#define LIBRARY_MAIN_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LIBRARY_TYPE_MAIN_PAGE, LibraryMainPageClass))
+
+typedef struct _LibraryMainPage LibraryMainPage;
+typedef struct _LibraryMainPageClass LibraryMainPageClass;
+typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
+enum  {
+	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL,
+	LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL
+};
+static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL] = {0};
+typedef struct _PagePrivate PagePrivate;
+
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_FULLSCREEN_WINDOW (fullscreen_window_get_type ())
+#define FULLSCREEN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FULLSCREEN_WINDOW, FullscreenWindow))
+#define FULLSCREEN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FULLSCREEN_WINDOW, FullscreenWindowClass))
+#define IS_FULLSCREEN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FULLSCREEN_WINDOW))
+#define IS_FULLSCREEN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FULLSCREEN_WINDOW))
+#define FULLSCREEN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FULLSCREEN_WINDOW, FullscreenWindowClass))
+
+typedef struct _FullscreenWindow FullscreenWindow;
+typedef struct _FullscreenWindowClass FullscreenWindowClass;
+
+#define TYPE_INJECTION_GROUP (injection_group_get_type ())
+#define INJECTION_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INJECTION_GROUP, InjectionGroup))
+#define INJECTION_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_INJECTION_GROUP, InjectionGroupClass))
+#define IS_INJECTION_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_INJECTION_GROUP))
+#define IS_INJECTION_GROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_INJECTION_GROUP))
+#define INJECTION_GROUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_INJECTION_GROUP, InjectionGroupClass))
+
+typedef struct _InjectionGroup InjectionGroup;
+typedef struct _InjectionGroupClass InjectionGroupClass;
+typedef struct _CheckerboardPagePrivate CheckerboardPagePrivate;
+
+#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_VIEW (data_view_get_type ())
+#define DATA_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_VIEW, DataView))
+#define DATA_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_VIEW, DataViewClass))
+#define IS_DATA_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_VIEW))
+#define IS_DATA_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_VIEW))
+#define DATA_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_VIEW, DataViewClass))
+
+typedef struct _DataView DataView;
+typedef struct _DataViewClass DataViewClass;
+
+#define TYPE_THUMBNAIL_VIEW (thumbnail_view_get_type ())
+#define THUMBNAIL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_THUMBNAIL_VIEW, ThumbnailView))
+#define THUMBNAIL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_THUMBNAIL_VIEW, ThumbnailViewClass))
+#define IS_THUMBNAIL_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_THUMBNAIL_VIEW))
+#define IS_THUMBNAIL_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_THUMBNAIL_VIEW))
+#define THUMBNAIL_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_THUMBNAIL_VIEW, ThumbnailViewClass))
+
+typedef struct _ThumbnailView ThumbnailView;
+typedef struct _ThumbnailViewClass ThumbnailViewClass;
+
+#define TYPE_CHECKERBOARD_ITEM (checkerboard_item_get_type ())
+#define CHECKERBOARD_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_ITEM, CheckerboardItem))
+#define CHECKERBOARD_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CHECKERBOARD_ITEM, CheckerboardItemClass))
+#define IS_CHECKERBOARD_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CHECKERBOARD_ITEM))
+#define IS_CHECKERBOARD_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CHECKERBOARD_ITEM))
+#define CHECKERBOARD_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CHECKERBOARD_ITEM, CheckerboardItemClass))
+
+typedef struct _CheckerboardItem CheckerboardItem;
+typedef struct _CheckerboardItemClass CheckerboardItemClass;
+
+#define CHECKERBOARD_PAGE_TYPE_ACTIVATOR (checkerboard_page_activator_get_type ())
+
+#define CHECKERBOARD_PAGE_TYPE_KEYBOARD_MODIFIERS (checkerboard_page_keyboard_modifiers_get_type ())
+typedef struct _CheckerboardPageKeyboardModifiers CheckerboardPageKeyboardModifiers;
+
+#define TYPE_VIEW_FILTER (view_filter_get_type ())
+#define VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_FILTER, ViewFilter))
+#define VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_FILTER, ViewFilterClass))
+#define IS_VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIEW_FILTER))
+#define IS_VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIEW_FILTER))
+#define VIEW_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIEW_FILTER, ViewFilterClass))
+
+typedef struct _ViewFilter ViewFilter;
+typedef struct _ViewFilterClass ViewFilterClass;
+
+#define TYPE_SEARCH_VIEW_FILTER (search_view_filter_get_type ())
+#define SEARCH_VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SEARCH_VIEW_FILTER, SearchViewFilter))
+#define SEARCH_VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SEARCH_VIEW_FILTER, SearchViewFilterClass))
+#define IS_SEARCH_VIEW_FILTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SEARCH_VIEW_FILTER))
+#define IS_SEARCH_VIEW_FILTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SEARCH_VIEW_FILTER))
+#define SEARCH_VIEW_FILTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SEARCH_VIEW_FILTER, SearchViewFilterClass))
+
+typedef struct _SearchViewFilter SearchViewFilter;
+typedef struct _SearchViewFilterClass SearchViewFilterClass;
+
+#define CORE_TYPE_TRACKER (core_tracker_get_type ())
+#define CORE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_TRACKER, CoreTracker))
+#define CORE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CORE_TYPE_TRACKER, CoreTrackerClass))
+#define CORE_IS_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CORE_TYPE_TRACKER))
+#define CORE_IS_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CORE_TYPE_TRACKER))
+#define CORE_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CORE_TYPE_TRACKER, CoreTrackerClass))
+
+typedef struct _CoreTracker CoreTracker;
+typedef struct _CoreTrackerClass CoreTrackerClass;
+
+#define CORE_TYPE_VIEW_TRACKER (core_view_tracker_get_type ())
+#define CORE_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTracker))
+#define CORE_VIEW_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerClass))
+#define CORE_IS_VIEW_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CORE_TYPE_VIEW_TRACKER))
+#define CORE_IS_VIEW_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CORE_TYPE_VIEW_TRACKER))
+#define CORE_VIEW_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CORE_TYPE_VIEW_TRACKER, CoreViewTrackerClass))
+
+typedef struct _CoreViewTracker CoreViewTracker;
+typedef struct _CoreViewTrackerClass CoreViewTrackerClass;
+typedef struct _MediaPagePrivate MediaPagePrivate;
+
+#define TYPE_RATING (rating_get_type ())
+
+#define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
+
+#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;
+typedef struct _CollectionPagePrivate CollectionPagePrivate;
+typedef struct _LibraryMainPagePrivate LibraryMainPagePrivate;
+
+#define TYPE_DATA_COLLECTION (data_collection_get_type ())
+#define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
+#define DATA_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_COLLECTION, DataCollectionClass))
+#define IS_DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATA_COLLECTION))
+#define IS_DATA_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATA_COLLECTION))
+#define DATA_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATA_COLLECTION, DataCollectionClass))
+
+typedef struct _DataCollection DataCollection;
+typedef struct _DataCollectionClass DataCollectionClass;
+
+#define TYPE_SOURCE_COLLECTION (source_collection_get_type ())
+#define SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SOURCE_COLLECTION, SourceCollection))
+#define SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SOURCE_COLLECTION, SourceCollectionClass))
+#define IS_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SOURCE_COLLECTION))
+#define IS_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SOURCE_COLLECTION))
+#define SOURCE_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SOURCE_COLLECTION, SourceCollectionClass))
+
+typedef struct _SourceCollection SourceCollection;
+typedef struct _SourceCollectionClass SourceCollectionClass;
+
+#define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ())
+#define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection))
+#define DATABASE_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollectionClass))
+#define IS_DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_DATABASE_SOURCE_COLLECTION))
+#define IS_DATABASE_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_DATABASE_SOURCE_COLLECTION))
+#define DATABASE_SOURCE_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollectionClass))
+
+typedef struct _DatabaseSourceCollection DatabaseSourceCollection;
+typedef struct _DatabaseSourceCollectionClass DatabaseSourceCollectionClass;
+
+#define TYPE_MEDIA_SOURCE_COLLECTION (media_source_collection_get_type ())
+#define MEDIA_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection))
+#define MEDIA_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollectionClass))
+#define IS_MEDIA_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_SOURCE_COLLECTION))
+#define IS_MEDIA_SOURCE_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_SOURCE_COLLECTION))
+#define MEDIA_SOURCE_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollectionClass))
+
+typedef struct _MediaSourceCollection MediaSourceCollection;
+typedef struct _MediaSourceCollectionClass MediaSourceCollectionClass;
+
+#define TYPE_MEDIA_COLLECTION_REGISTRY (media_collection_registry_get_type ())
+#define MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistry))
+#define MEDIA_COLLECTION_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistryClass))
+#define IS_MEDIA_COLLECTION_REGISTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEDIA_COLLECTION_REGISTRY))
+#define IS_MEDIA_COLLECTION_REGISTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEDIA_COLLECTION_REGISTRY))
+#define MEDIA_COLLECTION_REGISTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MEDIA_COLLECTION_REGISTRY, MediaCollectionRegistryClass))
+
+typedef struct _MediaCollectionRegistry MediaCollectionRegistry;
+typedef struct _MediaCollectionRegistryClass MediaCollectionRegistryClass;
+#define _media_collection_registry_unref0(var) ((var == NULL) ? NULL : (var = (media_collection_registry_unref (var), NULL)))
+
+#define TYPE_VIEW_COLLECTION (view_collection_get_type ())
+#define VIEW_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_COLLECTION, ViewCollection))
+#define VIEW_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_COLLECTION, ViewCollectionClass))
+#define IS_VIEW_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIEW_COLLECTION))
+#define IS_VIEW_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIEW_COLLECTION))
+#define VIEW_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIEW_COLLECTION, ViewCollectionClass))
+
+typedef struct _ViewCollection ViewCollection;
+typedef struct _ViewCollectionClass ViewCollectionClass;
+
+#define TYPE_VIEW_MANAGER (view_manager_get_type ())
+#define VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_VIEW_MANAGER, ViewManager))
+#define VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_VIEW_MANAGER, ViewManagerClass))
+#define IS_VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_VIEW_MANAGER))
+#define IS_VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_VIEW_MANAGER))
+#define VIEW_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_VIEW_MANAGER, ViewManagerClass))
+
+typedef struct _ViewManager ViewManager;
+typedef struct _ViewManagerClass ViewManagerClass;
+
+#define TYPE_ALTERATION (alteration_get_type ())
+#define ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALTERATION, Alteration))
+#define ALTERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ALTERATION, AlterationClass))
+#define IS_ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ALTERATION))
+#define IS_ALTERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ALTERATION))
+#define ALTERATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ALTERATION, AlterationClass))
+
+typedef struct _Alteration Alteration;
+typedef struct _AlterationClass AlterationClass;
+
+#define VIEW_COLLECTION_TYPE_MONITOR (view_collection_monitor_get_type ())
+#define VIEW_COLLECTION_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitor))
+#define VIEW_COLLECTION_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitorClass))
+#define VIEW_COLLECTION_IS_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIEW_COLLECTION_TYPE_MONITOR))
+#define VIEW_COLLECTION_IS_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIEW_COLLECTION_TYPE_MONITOR))
+#define VIEW_COLLECTION_MONITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VIEW_COLLECTION_TYPE_MONITOR, ViewCollectionMonitorClass))
+
+typedef struct _ViewCollectionMonitor ViewCollectionMonitor;
+typedef struct _ViewCollectionMonitorClass ViewCollectionMonitorClass;
+
+#define TYPE_COLLECTION_VIEW_MANAGER (collection_view_manager_get_type ())
+#define COLLECTION_VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager))
+#define COLLECTION_VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManagerClass))
+#define IS_COLLECTION_VIEW_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COLLECTION_VIEW_MANAGER))
+#define IS_COLLECTION_VIEW_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COLLECTION_VIEW_MANAGER))
+#define COLLECTION_VIEW_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManagerClass))
+
+typedef struct _CollectionViewManager CollectionViewManager;
+typedef struct _CollectionViewManagerClass CollectionViewManagerClass;
+#define _view_collection_monitor_unref0(var) ((var == NULL) ? NULL : (var = (view_collection_monitor_unref (var), NULL)))
+#define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
+#define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
+
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
+
+struct _SidebarBranch {
+	GObject parent_instance;
+	SidebarBranchPrivate * priv;
+};
+
+struct _SidebarBranchClass {
+	GObjectClass parent_class;
+};
+
+struct _LibraryBranch {
+	SidebarBranch parent_instance;
+	LibraryBranchPrivate * priv;
+};
+
+struct _LibraryBranchClass {
+	SidebarBranchClass parent_class;
+};
+
+struct _LibraryBranchPrivate {
+	LibraryPhotosEntry* _photos_entry;
+	LibraryFlaggedSidebarEntry* _flagged_entry;
+	LibraryLastImportSidebarEntry* _last_imported_entry;
+	LibraryImportQueueSidebarEntry* _import_queue_entry;
+	LibraryOfflineSidebarEntry* _offline_entry;
+	LibraryTrashSidebarEntry* _trash_entry;
+};
+
+typedef enum  {
+	LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS,
+	LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED,
+	LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED,
+	LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE,
+	LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE,
+	LIBRARY_BRANCH_ENTRY_POSITION_TRASH
+} LibraryBranchEntryPosition;
+
+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 _SidebarSelectableEntryIface {
+	GTypeInterface parent_iface;
+};
+
+struct _SidebarPageRepresentativeIface {
+	GTypeInterface parent_iface;
+	gboolean (*has_page) (SidebarPageRepresentative* self);
+	Page* (*get_page) (SidebarPageRepresentative* self);
+};
+
+struct _SidebarContextableIface {
+	GTypeInterface parent_iface;
+	GtkMenu* (*get_sidebar_context_menu) (SidebarContextable* self, GdkEventButton* event);
+};
+
+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 _LibraryPhotosEntry {
+	SidebarSimplePageEntry parent_instance;
+	LibraryPhotosEntryPrivate * priv;
+};
+
+struct _LibraryPhotosEntryClass {
+	SidebarSimplePageEntryClass parent_class;
+};
+
+typedef gboolean (*ProgressMonitor) (guint64 current, guint64 total, gboolean do_event_loop, void* user_data);
+struct _LibraryHideablePageEntry {
+	SidebarSimplePageEntry parent_instance;
+	LibraryHideablePageEntryPrivate * priv;
+};
+
+struct _LibraryHideablePageEntryClass {
+	SidebarSimplePageEntryClass parent_class;
+};
+
+struct _LibraryHideablePageEntryPrivate {
+	gboolean show_entry;
+};
+
+struct _Page {
+	GtkScrolledWindow parent_instance;
+	PagePrivate * priv;
+	GtkBuilder* builder;
+	GtkToolbar* toolbar;
+	gboolean in_view;
+};
+
+struct _PageClass {
+	GtkScrolledWindowClass parent_class;
+	void (*set_page_name) (Page* self, const gchar* page_name);
+	void (*set_container) (Page* self, GtkWindow* container);
+	void (*clear_container) (Page* self);
+	GtkToolbar* (*get_toolbar) (Page* self);
+	GtkMenu* (*get_page_context_menu) (Page* self);
+	void (*switching_from) (Page* self);
+	void (*switched_to) (Page* self);
+	void (*ready) (Page* self);
+	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self, GActionMap* map);
+	void (*remove_actions) (Page* self, GActionMap* map);
+	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
+	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
+	void (*init_actions) (Page* self, gint selected_count, gint count);
+	void (*update_actions) (Page* self, gint selected_count, gint count);
+	gboolean (*source_drag_failed) (Page* self, GdkDragContext* context, GtkDragResult drag_result);
+	gboolean (*on_left_click) (Page* self, GdkEventButton* event);
+	gboolean (*on_middle_click) (Page* self, GdkEventButton* event);
+	gboolean (*on_right_click) (Page* self, GdkEventButton* event);
+	gboolean (*on_left_released) (Page* self, GdkEventButton* event);
+	gboolean (*on_middle_released) (Page* self, GdkEventButton* event);
+	gboolean (*on_right_released) (Page* self, GdkEventButton* event);
+	gboolean (*on_ctrl_pressed) (Page* self, GdkEventKey* event);
+	gboolean (*on_ctrl_released) (Page* self, GdkEventKey* event);
+	gboolean (*on_alt_pressed) (Page* self, GdkEventKey* event);
+	gboolean (*on_alt_released) (Page* self, GdkEventKey* event);
+	gboolean (*on_shift_pressed) (Page* self, GdkEventKey* event);
+	gboolean (*on_shift_released) (Page* self, GdkEventKey* event);
+	gboolean (*on_super_pressed) (Page* self, GdkEventKey* event);
+	gboolean (*on_super_released) (Page* self, GdkEventKey* event);
+	gboolean (*on_app_key_pressed) (Page* self, GdkEventKey* event);
+	gboolean (*on_app_key_released) (Page* self, GdkEventKey* event);
+	void (*on_move) (Page* self, GdkRectangle* rect);
+	void (*on_move_start) (Page* self, GdkRectangle* rect);
+	void (*on_move_finished) (Page* self, GdkRectangle* rect);
+	void (*on_resize) (Page* self, GdkRectangle* rect);
+	void (*on_resize_start) (Page* self, GdkRectangle* rect);
+	void (*on_resize_finished) (Page* self, GdkRectangle* rect);
+	gboolean (*on_configure) (Page* self, GdkEventConfigure* event, GdkRectangle* rect);
+	gboolean (*on_motion) (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask);
+	gboolean (*on_leave_notify_event) (Page* self);
+	gboolean (*on_mousewheel_up) (Page* self, GdkEventScroll* event);
+	gboolean (*on_mousewheel_down) (Page* self, GdkEventScroll* event);
+	gboolean (*on_mousewheel_left) (Page* self, GdkEventScroll* event);
+	gboolean (*on_mousewheel_right) (Page* self, GdkEventScroll* event);
+	gboolean (*on_context_keypress) (Page* self);
+	gboolean (*on_context_buttonpress) (Page* self, GdkEventButton* event);
+	gboolean (*on_context_invoked) (Page* self);
+	void (*set_page_cursor) (Page* self, GdkCursorType cursor_type);
+};
+
+typedef enum  {
+	CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD,
+	CHECKERBOARD_PAGE_ACTIVATOR_MOUSE
+} CheckerboardPageActivator;
+
+struct _CheckerboardPageKeyboardModifiers {
+	gboolean ctrl_pressed;
+	gboolean alt_pressed;
+	gboolean shift_pressed;
+	gboolean super_pressed;
+};
+
+struct _CheckerboardPage {
+	Page parent_instance;
+	CheckerboardPagePrivate * priv;
+	CheckerboardItem* anchor;
+	CheckerboardItem* cursor;
+};
+
+struct _CheckerboardPageClass {
+	PageClass parent_class;
+	GtkMenu* (*get_item_context_menu) (CheckerboardPage* self);
+	gchar* (*get_view_empty_message) (CheckerboardPage* self);
+	gchar* (*get_filter_no_match_message) (CheckerboardPage* self);
+	void (*on_item_activated) (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers);
+	SearchViewFilter* (*get_search_view_filter) (CheckerboardPage* self);
+	CoreViewTracker* (*get_view_tracker) (CheckerboardPage* self);
+	gboolean (*on_mouse_over) (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask);
+	void (*set_display_titles) (CheckerboardPage* self, gboolean display);
+	void (*set_display_comments) (CheckerboardPage* self, gboolean display);
+};
+
+typedef enum  {
+	RATING_REJECTED = -1,
+	RATING_UNRATED = 0,
+	RATING_ONE = 1,
+	RATING_TWO = 2,
+	RATING_THREE = 3,
+	RATING_FOUR = 4,
+	RATING_FIVE = 5
+} Rating;
+
+typedef enum  {
+	RAW_DEVELOPER_SHOTWELL = 0,
+	RAW_DEVELOPER_CAMERA,
+	RAW_DEVELOPER_EMBEDDED
+} RawDeveloper;
+
+struct _MediaPage {
+	CheckerboardPage parent_instance;
+	MediaPagePrivate * priv;
+};
+
+struct _MediaPageClass {
+	CheckerboardPageClass parent_class;
+	void (*on_zoom_changed) (MediaPage* self);
+	void (*on_export) (MediaPage* self);
+	void (*on_increase_size) (MediaPage* self);
+	void (*on_decrease_size) (MediaPage* self);
+	void (*on_increase_rating) (MediaPage* self);
+	void (*on_decrease_rating) (MediaPage* self);
+	void (*on_set_rating) (MediaPage* self, Rating rating);
+	void (*on_rate_rejected) (MediaPage* self);
+	void (*on_rate_unrated) (MediaPage* self);
+	void (*on_rate_one) (MediaPage* self);
+	void (*on_rate_two) (MediaPage* self);
+	void (*on_rate_three) (MediaPage* self);
+	void (*on_rate_four) (MediaPage* self);
+	void (*on_rate_five) (MediaPage* self);
+	void (*on_move_to_trash) (MediaPage* self);
+	void (*on_edit_title) (MediaPage* self);
+	void (*on_edit_comment) (MediaPage* self);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
+	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
+	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
+};
+
+struct _CollectionPage {
+	MediaPage parent_instance;
+	CollectionPagePrivate * priv;
+};
+
+struct _CollectionPageClass {
+	MediaPageClass parent_class;
+};
+
+struct _LibraryMainPage {
+	CollectionPage parent_instance;
+	LibraryMainPagePrivate * priv;
+};
+
+struct _LibraryMainPageClass {
+	CollectionPageClass parent_class;
+};
+
+
+static gpointer library_branch_parent_class = NULL;
+static gpointer library_photos_entry_parent_class = NULL;
+static gpointer library_hideable_page_entry_parent_class = NULL;
+static gpointer library_main_page_parent_class = NULL;
+
+GType sidebar_branch_get_type (void) G_GNUC_CONST;
+GType library_branch_get_type (void) G_GNUC_CONST;
+GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
+GType library_photos_entry_get_type (void) G_GNUC_CONST;
+GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
+GType library_flagged_sidebar_entry_get_type (void) G_GNUC_CONST;
+GType library_last_import_sidebar_entry_get_type (void) G_GNUC_CONST;
+GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST;
+GType library_offline_sidebar_entry_get_type (void) G_GNUC_CONST;
+GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST;
+#define LIBRARY_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_BRANCH, LibraryBranchPrivate))
+enum  {
+	LIBRARY_BRANCH_DUMMY_PROPERTY,
+	LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY
+};
+static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+#define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position"
+LibraryBranch* library_branch_new (void);
+LibraryBranch* library_branch_construct (GType object_type);
+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);
+GType sidebar_grouping_get_type (void) G_GNUC_CONST;
+GType sidebar_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 library_branch_comparator (SidebarEntry* a, SidebarEntry* b);
+static gint _library_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);
+LibraryPhotosEntry* library_photos_entry_new (void);
+LibraryPhotosEntry* library_photos_entry_construct (GType object_type);
+static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value);
+LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void);
+LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type);
+static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value);
+LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void);
+LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type);
+static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value);
+LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void);
+LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type);
+static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value);
+LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void);
+LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type);
+static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value);
+LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void);
+LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type);
+static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value);
+static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position);
+LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self);
+LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self);
+LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self);
+static void library_branch_on_flagged_visibility_changed (LibraryBranch* self);
+static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
+LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self);
+static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self);
+static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
+LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self);
+static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self);
+static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
+LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self);
+static void library_branch_on_offline_visibility_changed (LibraryBranch* self);
+static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
+void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
+static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position);
+gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self);
+gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
+void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
+static void library_branch_finalize (GObject * obj);
+static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+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_contextable_get_type (void) G_GNUC_CONST;
+enum  {
+	LIBRARY_PHOTOS_ENTRY_DUMMY_PROPERTY
+};
+SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
+static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
+static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
+#define RESOURCES_ICON_PHOTOS "shotwell"
+static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base);
+LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target);
+LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target);
+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 library_main_page_get_type (void) G_GNUC_CONST;
+#define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryPrivate))
+enum  {
+	LIBRARY_HIDEABLE_PAGE_ENTRY_DUMMY_PROPERTY,
+	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY
+};
+LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+static void library_hideable_page_entry_finalize (GObject * obj);
+static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+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);
+gpointer value_get_injection_group (const GValue* value);
+GType injection_group_get_type (void) G_GNUC_CONST;
+GType data_object_get_type (void) G_GNUC_CONST;
+GType data_view_get_type (void) G_GNUC_CONST;
+GType thumbnail_view_get_type (void) G_GNUC_CONST;
+GType checkerboard_item_get_type (void) G_GNUC_CONST;
+GType checkerboard_page_activator_get_type (void) G_GNUC_CONST;
+GType checkerboard_page_keyboard_modifiers_get_type (void) G_GNUC_CONST;
+CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self);
+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);
+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);
+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;
+GType data_source_get_type (void) G_GNUC_CONST;
+enum  {
+	LIBRARY_MAIN_PAGE_DUMMY_PROPERTY
+};
+#define LIBRARY_MAIN_PAGE_NAME _ ("Library")
+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);
+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 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);
+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);
+GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
+GType view_collection_get_type (void) G_GNUC_CONST;
+ViewCollection* page_get_view (Page* self);
+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);
+gpointer value_get_view_manager (const GValue* value);
+GType view_manager_get_type (void) G_GNUC_CONST;
+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);
+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);
+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);
+CollectionViewManager* collection_view_manager_new (CollectionPage* page);
+CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
+GType collection_view_manager_get_type (void) G_GNUC_CONST;
+static void library_main_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 library_main_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 GType library_branch_entry_position_get_type (void) {
+	static volatile gsize library_branch_entry_position_type_id__volatile = 0;
+	if (g_once_init_enter (&library_branch_entry_position_type_id__volatile)) {
+		static const GEnumValue values[] = {{LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS, "LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS", "photos"}, {LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED, "LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED", "flagged"}, {LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED, "LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED", "last-imported"}, {LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE, "LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE", "import-queue"}, {LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE, "LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE", "offline"}, {LIBRARY_BRANCH_ENTRY_POSITION_TRASH, "LIBRARY_BRANCH_ENTRY_POSITION_TRASH", "trash"}, {0, NULL, NULL}};
+		GType library_branch_entry_position_type_id;
+		library_branch_entry_position_type_id = g_enum_register_static ("LibraryBranchEntryPosition", values);
+		g_once_init_leave (&library_branch_entry_position_type_id__volatile, library_branch_entry_position_type_id);
+	}
+	return library_branch_entry_position_type_id__volatile;
+}
+
+
+static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+	gint result;
+	result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1000 "LibraryBranch.c"
+}
+
+
+static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
+#line 1007 "LibraryBranch.c"
+}
+
+
+static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
+#line 1014 "LibraryBranch.c"
+}
+
+
+static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
+#line 1021 "LibraryBranch.c"
+}
+
+
+static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
+#line 1028 "LibraryBranch.c"
+}
+
+
+LibraryBranch* library_branch_construct (GType object_type) {
+	LibraryBranch * self = NULL;
+	SidebarHeader* _tmp0_;
+	SidebarHeader* _tmp1_;
+	LibraryPhotosEntry* _tmp2_;
+	LibraryPhotosEntry* _tmp3_;
+	LibraryTrashSidebarEntry* _tmp4_;
+	LibraryTrashSidebarEntry* _tmp5_;
+	LibraryLastImportSidebarEntry* _tmp6_;
+	LibraryLastImportSidebarEntry* _tmp7_;
+	LibraryFlaggedSidebarEntry* _tmp8_;
+	LibraryFlaggedSidebarEntry* _tmp9_;
+	LibraryOfflineSidebarEntry* _tmp10_;
+	LibraryOfflineSidebarEntry* _tmp11_;
+	LibraryImportQueueSidebarEntry* _tmp12_;
+	LibraryImportQueueSidebarEntry* _tmp13_;
+	LibraryPhotosEntry* _tmp14_;
+	LibraryTrashSidebarEntry* _tmp15_;
+	LibraryFlaggedSidebarEntry* _tmp16_;
+	LibraryLastImportSidebarEntry* _tmp17_;
+	LibraryImportQueueSidebarEntry* _tmp18_;
+	LibraryOfflineSidebarEntry* _tmp19_;
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = sidebar_header_new (_ ("Library"), _ ("Organize and browse your photos"), TRUE);
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp1_ = _tmp0_;
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL);
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp1_);
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp2_ = library_photos_entry_new ();
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp3_ = _tmp2_;
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_set_photos_entry (self, _tmp3_);
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp3_);
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp4_ = library_trash_sidebar_entry_new ();
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp5_ = _tmp4_;
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_set_trash_entry (self, _tmp5_);
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp5_);
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp6_ = library_last_import_sidebar_entry_new ();
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp7_ = _tmp6_;
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_set_last_imported_entry (self, _tmp7_);
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp7_);
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp8_ = library_flagged_sidebar_entry_new ();
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp9_ = _tmp8_;
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_set_flagged_entry (self, _tmp9_);
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp9_);
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp10_ = library_offline_sidebar_entry_new ();
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp11_ = _tmp10_;
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_set_offline_entry (self, _tmp11_);
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp11_);
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp12_ = library_import_queue_sidebar_entry_new ();
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp13_ = _tmp12_;
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_set_import_queue_entry (self, _tmp13_);
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp13_);
+#line 40 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp14_ = self->priv->_photos_entry;
+#line 40 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS);
+#line 41 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp15_ = self->priv->_trash_entry;
+#line 41 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH);
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp16_ = self->priv->_flagged_entry;
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+#line 44 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_flagged_visibility_changed (self);
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp17_ = self->priv->_last_imported_entry;
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+#line 47 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_last_imported_visibility_changed (self);
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp18_ = self->priv->_import_queue_entry;
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+#line 50 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_import_queue_visibility_changed (self);
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp19_ = self->priv->_offline_entry;
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+#line 53 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_on_offline_visibility_changed (self);
+#line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return self;
+#line 1144 "LibraryBranch.c"
+}
+
+
+LibraryBranch* library_branch_new (void) {
+#line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return library_branch_construct (LIBRARY_TYPE_BRANCH);
+#line 1151 "LibraryBranch.c"
+}
+
+
+static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position) {
+	SidebarEntry* _tmp0_;
+	gint _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
+	SidebarEntry* _tmp4_;
+#line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = entry;
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp1_ = position;
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_set_data_full (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA, (gpointer) ((gintptr) _tmp1_), NULL);
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp3_ = _tmp2_;
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp4_ = entry;
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL);
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp3_);
+#line 1181 "LibraryBranch.c"
+}
+
+
+static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
+	LibraryFlaggedSidebarEntry* _tmp0_;
+#line 61 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 62 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_flagged_entry;
+#line 62 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED);
+#line 1193 "LibraryBranch.c"
+}
+
+
+static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) {
+	LibraryLastImportSidebarEntry* _tmp0_;
+#line 65 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 66 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_last_imported_entry;
+#line 66 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED);
+#line 1205 "LibraryBranch.c"
+}
+
+
+static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) {
+	LibraryImportQueueSidebarEntry* _tmp0_;
+#line 69 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 70 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_import_queue_entry;
+#line 70 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE);
+#line 1217 "LibraryBranch.c"
+}
+
+
+static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
+	LibraryOfflineSidebarEntry* _tmp0_;
+#line 73 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 74 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_offline_entry;
+#line 74 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE);
+#line 1229 "LibraryBranch.c"
+}
+
+
+static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position) {
+	LibraryHideablePageEntry* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+#line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (entry));
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = entry;
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp1_ = library_hideable_page_entry_get_visible (_tmp0_);
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp2_ = _tmp1_;
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (_tmp2_) {
+#line 1249 "LibraryBranch.c"
+		LibraryHideablePageEntry* _tmp3_;
+		gboolean _tmp4_;
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp3_ = entry;
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		if (!_tmp4_) {
+#line 1258 "LibraryBranch.c"
+			LibraryHideablePageEntry* _tmp5_;
+			gint _tmp6_;
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp5_ = entry;
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp6_ = position;
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_);
+#line 1267 "LibraryBranch.c"
+		}
+	} else {
+		LibraryHideablePageEntry* _tmp7_;
+		gboolean _tmp8_;
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp7_ = entry;
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		if (_tmp8_) {
+#line 1278 "LibraryBranch.c"
+			LibraryHideablePageEntry* _tmp9_;
+#line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp9_ = entry;
+#line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 1284 "LibraryBranch.c"
+		}
+	}
+}
+
+
+static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
+	gint result = 0;
+	SidebarEntry* _tmp0_;
+	gconstpointer _tmp1_;
+	SidebarEntry* _tmp2_;
+	gconstpointer _tmp3_;
+#line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
+#line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = a;
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp1_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp2_ = b;
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp3_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_));
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1312 "LibraryBranch.c"
+}
+
+
+LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
+	LibraryPhotosEntry* result;
+	LibraryPhotosEntry* _tmp0_;
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_photos_entry;
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1327 "LibraryBranch.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1334 "LibraryBranch.c"
+}
+
+
+static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) {
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (library_branch_get_photos_entry (self) != value) {
+#line 1343 "LibraryBranch.c"
+		LibraryPhotosEntry* _tmp0_;
+		LibraryPhotosEntry* _tmp1_;
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp0_ = value;
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (self->priv->_photos_entry);
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		self->priv->_photos_entry = _tmp1_;
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_object_notify ((GObject *) self, "photos-entry");
+#line 1356 "LibraryBranch.c"
+	}
+}
+
+
+LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) {
+	LibraryFlaggedSidebarEntry* result;
+	LibraryFlaggedSidebarEntry* _tmp0_;
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_flagged_entry;
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1372 "LibraryBranch.c"
+}
+
+
+static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) {
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (library_branch_get_flagged_entry (self) != value) {
+#line 1381 "LibraryBranch.c"
+		LibraryFlaggedSidebarEntry* _tmp0_;
+		LibraryFlaggedSidebarEntry* _tmp1_;
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp0_ = value;
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (self->priv->_flagged_entry);
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		self->priv->_flagged_entry = _tmp1_;
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_object_notify ((GObject *) self, "flagged-entry");
+#line 1394 "LibraryBranch.c"
+	}
+}
+
+
+LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) {
+	LibraryLastImportSidebarEntry* result;
+	LibraryLastImportSidebarEntry* _tmp0_;
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_last_imported_entry;
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1410 "LibraryBranch.c"
+}
+
+
+static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) {
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (library_branch_get_last_imported_entry (self) != value) {
+#line 1419 "LibraryBranch.c"
+		LibraryLastImportSidebarEntry* _tmp0_;
+		LibraryLastImportSidebarEntry* _tmp1_;
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp0_ = value;
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (self->priv->_last_imported_entry);
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		self->priv->_last_imported_entry = _tmp1_;
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_object_notify ((GObject *) self, "last-imported-entry");
+#line 1432 "LibraryBranch.c"
+	}
+}
+
+
+LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) {
+	LibraryImportQueueSidebarEntry* result;
+	LibraryImportQueueSidebarEntry* _tmp0_;
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_import_queue_entry;
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1448 "LibraryBranch.c"
+}
+
+
+static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) {
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (library_branch_get_import_queue_entry (self) != value) {
+#line 1457 "LibraryBranch.c"
+		LibraryImportQueueSidebarEntry* _tmp0_;
+		LibraryImportQueueSidebarEntry* _tmp1_;
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp0_ = value;
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (self->priv->_import_queue_entry);
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		self->priv->_import_queue_entry = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_object_notify ((GObject *) self, "import-queue-entry");
+#line 1470 "LibraryBranch.c"
+	}
+}
+
+
+LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) {
+	LibraryOfflineSidebarEntry* result;
+	LibraryOfflineSidebarEntry* _tmp0_;
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_offline_entry;
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1486 "LibraryBranch.c"
+}
+
+
+static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) {
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (library_branch_get_offline_entry (self) != value) {
+#line 1495 "LibraryBranch.c"
+		LibraryOfflineSidebarEntry* _tmp0_;
+		LibraryOfflineSidebarEntry* _tmp1_;
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp0_ = value;
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (self->priv->_offline_entry);
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		self->priv->_offline_entry = _tmp1_;
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_object_notify ((GObject *) self, "offline-entry");
+#line 1508 "LibraryBranch.c"
+	}
+}
+
+
+LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
+	LibraryTrashSidebarEntry* result;
+	LibraryTrashSidebarEntry* _tmp0_;
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->_trash_entry;
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1524 "LibraryBranch.c"
+}
+
+
+static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) {
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_BRANCH (self));
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (library_branch_get_trash_entry (self) != value) {
+#line 1533 "LibraryBranch.c"
+		LibraryTrashSidebarEntry* _tmp0_;
+		LibraryTrashSidebarEntry* _tmp1_;
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp0_ = value;
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (self->priv->_trash_entry);
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		self->priv->_trash_entry = _tmp1_;
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_object_notify ((GObject *) self, "trash-entry");
+#line 1546 "LibraryBranch.c"
+	}
+}
+
+
+static void library_branch_class_init (LibraryBranchClass * klass) {
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_branch_parent_class = g_type_class_peek_parent (klass);
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_type_class_add_private (klass, sizeof (LibraryBranchPrivate));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_library_branch_get_property;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_library_branch_set_property;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (klass)->finalize = library_branch_finalize;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1574 "LibraryBranch.c"
+}
+
+
+static void library_branch_instance_init (LibraryBranch * self) {
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
+#line 1581 "LibraryBranch.c"
+}
+
+
+static void library_branch_finalize (GObject * obj) {
+	LibraryBranch * self;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch);
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (self->priv->_photos_entry);
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (self->priv->_flagged_entry);
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (self->priv->_last_imported_entry);
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (self->priv->_import_queue_entry);
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (self->priv->_offline_entry);
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (self->priv->_trash_entry);
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
+#line 1603 "LibraryBranch.c"
+}
+
+
+GType library_branch_get_type (void) {
+	static volatile gsize library_branch_type_id__volatile = 0;
+	if (g_once_init_enter (&library_branch_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (LibraryBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryBranch), 0, (GInstanceInitFunc) library_branch_instance_init, NULL };
+		GType library_branch_type_id;
+		library_branch_type_id = g_type_register_static (SIDEBAR_TYPE_BRANCH, "LibraryBranch", &g_define_type_info, 0);
+		g_once_init_leave (&library_branch_type_id__volatile, library_branch_type_id);
+	}
+	return library_branch_type_id__volatile;
+}
+
+
+static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	LibraryBranch * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	switch (property_id) {
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_value_set_object (value, library_branch_get_photos_entry (self));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_value_set_object (value, library_branch_get_flagged_entry (self));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_value_set_object (value, library_branch_get_last_imported_entry (self));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_value_set_object (value, library_branch_get_import_queue_entry (self));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_value_set_object (value, library_branch_get_offline_entry (self));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_value_set_object (value, library_branch_get_trash_entry (self));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1660 "LibraryBranch.c"
+		default:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1666 "LibraryBranch.c"
+	}
+}
+
+
+static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	LibraryBranch * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	switch (property_id) {
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		library_branch_set_photos_entry (self, g_value_get_object (value));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		library_branch_set_flagged_entry (self, g_value_get_object (value));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		library_branch_set_last_imported_entry (self, g_value_get_object (value));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		library_branch_set_import_queue_entry (self, g_value_get_object (value));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		library_branch_set_offline_entry (self, g_value_get_object (value));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		library_branch_set_trash_entry (self, g_value_get_object (value));
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1712 "LibraryBranch.c"
+		default:
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1718 "LibraryBranch.c"
+	}
+}
+
+
+LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
+	LibraryPhotosEntry * self = NULL;
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type);
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return self;
+#line 1729 "LibraryBranch.c"
+}
+
+
+LibraryPhotosEntry* library_photos_entry_new (void) {
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
+#line 1736 "LibraryBranch.c"
+}
+
+
+static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+	LibraryPhotosEntry * self;
+	gchar* result = NULL;
+	gchar* _tmp0_;
+#line 96 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = g_strdup (_ ("Photos"));
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1752 "LibraryBranch.c"
+}
+
+
+static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+	LibraryPhotosEntry * self;
+	gchar* result = NULL;
+	gchar* _tmp0_;
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = g_strdup (RESOURCES_ICON_PHOTOS);
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1768 "LibraryBranch.c"
+}
+
+
+static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base) {
+	LibraryPhotosEntry * self;
+	Page* result = NULL;
+	LibraryMainPage* _tmp0_;
+#line 104 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = library_main_page_new (NULL, NULL);
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_ref_sink (_tmp0_);
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1786 "LibraryBranch.c"
+}
+
+
+static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_photos_entry_parent_class = g_type_class_peek_parent (klass);
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_name;
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon;
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page;
+#line 1799 "LibraryBranch.c"
+}
+
+
+static void library_photos_entry_instance_init (LibraryPhotosEntry * self) {
+}
+
+
+GType library_photos_entry_get_type (void) {
+	static volatile gsize library_photos_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&library_photos_entry_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotosEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photos_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotosEntry), 0, (GInstanceInitFunc) library_photos_entry_instance_init, NULL };
+		GType library_photos_entry_type_id;
+		library_photos_entry_type_id = g_type_register_static (SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, "LibraryPhotosEntry", &g_define_type_info, 0);
+		g_once_init_leave (&library_photos_entry_type_id__volatile, library_photos_entry_type_id);
+	}
+	return library_photos_entry_type_id__volatile;
+}
+
+
+LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type) {
+	LibraryHideablePageEntry * self = NULL;
+#line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type);
+#line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return self;
+#line 1825 "LibraryBranch.c"
+}
+
+
+gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) {
+	gboolean result;
+	gboolean _tmp0_;
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_val_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self), FALSE);
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = self->priv->show_entry;
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	result = _tmp0_;
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return result;
+#line 1840 "LibraryBranch.c"
+}
+
+
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value) {
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
+#line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self));
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = value;
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp1_ = self->priv->show_entry;
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (_tmp0_ == _tmp1_) {
+#line 118 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		return;
+#line 1859 "LibraryBranch.c"
+	}
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp2_ = value;
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self->priv->show_entry = _tmp2_;
+#line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp3_ = value;
+#line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
+#line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_notify ((GObject *) self, "visible");
+#line 1871 "LibraryBranch.c"
+}
+
+
+static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass) {
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_hideable_page_entry_parent_class = g_type_class_peek_parent (klass);
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_type_class_add_private (klass, sizeof (LibraryHideablePageEntryPrivate));
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_library_hideable_page_entry_get_property;
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_library_hideable_page_entry_set_property;
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize;
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+#line 1890 "LibraryBranch.c"
+}
+
+
+static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self) {
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self);
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self->priv->show_entry = FALSE;
+#line 1899 "LibraryBranch.c"
+}
+
+
+static void library_hideable_page_entry_finalize (GObject * obj) {
+	LibraryHideablePageEntry * self;
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
+#line 1909 "LibraryBranch.c"
+}
+
+
+GType library_hideable_page_entry_get_type (void) {
+	static volatile gsize library_hideable_page_entry_type_id__volatile = 0;
+	if (g_once_init_enter (&library_hideable_page_entry_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (LibraryHideablePageEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_hideable_page_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryHideablePageEntry), 0, (GInstanceInitFunc) library_hideable_page_entry_instance_init, NULL };
+		GType library_hideable_page_entry_type_id;
+		library_hideable_page_entry_type_id = g_type_register_static (SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, "LibraryHideablePageEntry", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
+		g_once_init_leave (&library_hideable_page_entry_type_id__volatile, library_hideable_page_entry_type_id);
+	}
+	return library_hideable_page_entry_type_id__volatile;
+}
+
+
+static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	LibraryHideablePageEntry * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	switch (property_id) {
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		g_value_set_boolean (value, library_hideable_page_entry_get_visible (self));
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1936 "LibraryBranch.c"
+		default:
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1942 "LibraryBranch.c"
+	}
+}
+
+
+static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	LibraryHideablePageEntry * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	switch (property_id) {
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		library_hideable_page_entry_set_visible (self, g_value_get_boolean (value));
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1958 "LibraryBranch.c"
+		default:
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		break;
+#line 1964 "LibraryBranch.c"
+	}
+}
+
+
+LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target) {
+	LibraryMainPage * self = NULL;
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
+#line 1973 "LibraryBranch.c"
+	{
+		GeeIterator* _sources_it = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp0_ = media_collection_registry_get_instance ();
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp1_ = _tmp0_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp2_ = media_collection_registry_get_all (_tmp1_);
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp3_ = _tmp2_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_tmp5_ = _tmp4_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (_tmp3_);
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_media_collection_registry_unref0 (_tmp1_);
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_sources_it = _tmp5_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		while (TRUE) {
+#line 2002 "LibraryBranch.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
+			MediaSourceCollection* sources = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			ViewCollection* _tmp10_;
+			ViewCollection* _tmp11_;
+			MediaSourceCollection* _tmp12_;
+			CollectionViewManager* _tmp13_;
+			CollectionViewManager* _tmp14_;
+			ProgressMonitor _tmp15_;
+			void* _tmp15__target;
+			ViewCollectionMonitor* _tmp16_;
+			ViewCollectionMonitor* _tmp17_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp6_ = _sources_it;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp7_ = gee_iterator_next (_tmp6_);
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			if (!_tmp7_) {
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+				break;
+#line 2025 "LibraryBranch.c"
+			}
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp8_ = _sources_it;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp9_ = gee_iterator_get (_tmp8_);
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			sources = (MediaSourceCollection*) _tmp9_;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp11_ = _tmp10_;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp12_ = sources;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp13_ = collection_view_manager_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage));
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp14_ = _tmp13_;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp15_ = monitor;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp15__target = monitor_target;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp16_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, _tmp15_, _tmp15__target);
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_tmp17_ = _tmp16_;
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_view_collection_monitor_unref0 (_tmp17_);
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_view_manager_unref0 (_tmp14_);
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_data_collection_unref0 (_tmp11_);
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+			_data_collection_unref0 (sources);
+#line 2059 "LibraryBranch.c"
+		}
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		_g_object_unref0 (_sources_it);
+#line 2063 "LibraryBranch.c"
+	}
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return self;
+#line 2067 "LibraryBranch.c"
+}
+
+
+LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
+#line 2074 "LibraryBranch.c"
+}
+
+
+static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+	LibraryMainPage * self;
+	gboolean _vala_sort_order = FALSE;
+	gint _vala_sort_by = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	gint _tmp3_ = 0;
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp1_ = _tmp0_;
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	configuration_facade_get_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_vala_sort_order = _tmp2_;
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_vala_sort_by = _tmp3_;
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp1_);
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (sort_order) {
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		*sort_order = _vala_sort_order;
+#line 2104 "LibraryBranch.c"
+	}
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	if (sort_by) {
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+		*sort_by = _vala_sort_by;
+#line 2110 "LibraryBranch.c"
+	}
+}
+
+
+static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+	LibraryMainPage * self;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp1_ = _tmp0_;
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp2_ = sort_order;
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_tmp3_ = sort_by;
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	_g_object_unref0 (_tmp1_);
+#line 2135 "LibraryBranch.c"
+}
+
+
+static void library_main_page_class_init (LibraryMainPageClass * klass) {
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	library_main_page_parent_class = g_type_class_peek_parent (klass);
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort;
+#line 2146 "LibraryBranch.c"
+}
+
+
+static void library_main_page_instance_init (LibraryMainPage * self) {
+}
+
+
+GType library_main_page_get_type (void) {
+	static volatile gsize library_main_page_type_id__volatile = 0;
+	if (g_once_init_enter (&library_main_page_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (LibraryMainPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_main_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMainPage), 0, (GInstanceInitFunc) library_main_page_instance_init, NULL };
+		GType library_main_page_type_id;
+		library_main_page_type_id = g_type_register_static (TYPE_COLLECTION_PAGE, "LibraryMainPage", &g_define_type_info, 0);
+		g_once_init_leave (&library_main_page_type_id__volatile, library_main_page_type_id);
+	}
+	return library_main_page_type_id__volatile;
+}
+
+
+
diff --git a/src/library/LibraryBranch.vala b/src/library/LibraryBranch.vala
new file mode 100644
index 0000000..f9113f5
--- /dev/null
+++ b/src/library/LibraryBranch.vala
@@ -0,0 +1,147 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+public class Library.Branch : Sidebar.Branch {
+    private const string POSITION_DATA = "x-photos-entry-position";
+
+    public Library.PhotosEntry photos_entry { get; private set; }
+    public Library.FlaggedSidebarEntry flagged_entry { get; private set; }
+    public Library.LastImportSidebarEntry last_imported_entry { get; private set; }
+    public Library.ImportQueueSidebarEntry import_queue_entry { get; private set; }
+    public Library.OfflineSidebarEntry offline_entry { get; private set; }
+    public Library.TrashSidebarEntry trash_entry { get; private set; }
+    
+    // This lists the order of the library items in the sidebar. To re-order, simply move
+    // the item in this list to a new position. These numbers should *not* persist anywhere
+    // outside the app.
+    private enum EntryPosition {
+        PHOTOS,
+        FLAGGED,
+        LAST_IMPORTED,
+        IMPORT_QUEUE,
+        OFFLINE,
+        TRASH
+    }
+    
+    public Branch() {
+        base(new Sidebar.Header(_("Library"), _("Organize and browse your photos")),
+            Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
+
+        photos_entry = new Library.PhotosEntry();
+        trash_entry = new Library.TrashSidebarEntry();
+        last_imported_entry = new Library.LastImportSidebarEntry();
+        flagged_entry = new Library.FlaggedSidebarEntry();
+        offline_entry = new Library.OfflineSidebarEntry();
+        import_queue_entry = new Library.ImportQueueSidebarEntry();
+
+        insert(photos_entry, EntryPosition.PHOTOS);
+        insert(trash_entry, EntryPosition.TRASH);
+
+        flagged_entry.visibility_changed.connect(on_flagged_visibility_changed);
+        on_flagged_visibility_changed();
+
+        last_imported_entry.visibility_changed.connect(on_last_imported_visibility_changed);
+        on_last_imported_visibility_changed();
+
+        import_queue_entry.visibility_changed.connect(on_import_queue_visibility_changed);
+        on_import_queue_visibility_changed();
+
+        offline_entry.visibility_changed.connect(on_offline_visibility_changed);
+        on_offline_visibility_changed();
+    }
+    
+    private void insert(Sidebar.Entry entry, int position) {
+        entry.set_data<int>(POSITION_DATA, position);
+        graft(get_root(), entry);
+    }
+
+    private void on_flagged_visibility_changed() {
+        update_entry_visibility(flagged_entry, EntryPosition.FLAGGED);
+    }
+
+    private void on_last_imported_visibility_changed() {
+        update_entry_visibility(last_imported_entry, EntryPosition.LAST_IMPORTED);
+    }
+
+    private void on_import_queue_visibility_changed() {
+        update_entry_visibility(import_queue_entry, EntryPosition.IMPORT_QUEUE);
+    }
+
+    private void on_offline_visibility_changed() {
+        update_entry_visibility(offline_entry, EntryPosition.OFFLINE);
+    }
+
+    private void update_entry_visibility(Library.HideablePageEntry entry, int position) {
+        if (entry.visible) {
+            if (!has_entry(entry))
+                insert(entry, position);
+        } else if (has_entry(entry)) {
+            prune(entry);
+        }
+    }
+
+    private static int comparator(Sidebar.Entry a, Sidebar.Entry b) {
+        return a.get_data<int>(POSITION_DATA) - b.get_data<int>(POSITION_DATA);
+    }
+}
+
+public class Library.PhotosEntry : Sidebar.SimplePageEntry {
+    
+    public PhotosEntry() {
+    }
+    
+    public override string get_sidebar_name() {
+        return _("Photos");
+    }
+    
+    public override string? get_sidebar_icon() {
+        return Resources.ICON_PHOTOS;
+    }
+    
+    protected override Page create_page() {
+        return new Library.MainPage();
+    }
+}
+
+public abstract class Library.HideablePageEntry : Sidebar.SimplePageEntry {
+    // container branch should listen to this signal
+    public signal void visibility_changed(bool visible);
+
+    private bool show_entry = false;
+    public bool visible {
+        get { return show_entry; }
+        set {
+            if (value == show_entry)
+                return;
+
+            show_entry = value;
+            visibility_changed(value);
+        }
+    }
+
+    public HideablePageEntry() {
+    }
+}
+
+public class Library.MainPage : CollectionPage {
+    public const string NAME = _("Library");
+    
+    public MainPage(ProgressMonitor? monitor = null) {
+        base (NAME);
+        
+        foreach (MediaSourceCollection sources in MediaCollectionRegistry.get_instance().get_all())
+            get_view().monitor_source_collection(sources, new CollectionViewManager(this), null, null, monitor);
+    }
+    
+    protected override void get_config_photos_sort(out bool sort_order, out int sort_by) {
+        Config.Facade.get_instance().get_library_photos_sort(out sort_order, out sort_by);
+    }
+
+    protected override void set_config_photos_sort(bool sort_order, int sort_by) {
+        Config.Facade.get_instance().set_library_photos_sort(sort_order, sort_by);
+    }
+}
+
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 00ba201..bb92872 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -718,7 +718,6 @@ typedef struct _CommandManagerClass CommandManagerClass;
 
 typedef struct _SavedSearchDialog SavedSearchDialog;
 typedef struct _SavedSearchDialogClass SavedSearchDialogClass;
-#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL)))
 
 #define TYPE_BATCH_IMPORT (batch_import_get_type ())
 #define BATCH_IMPORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BATCH_IMPORT, BatchImport))
@@ -983,6 +982,7 @@ struct _SidebarEntryIface {
 
 struct _LibraryWindowPrivate {
 	gchar* import_dir;
+	gboolean import_recursive;
 	GtkPaned* sidebar_paned;
 	GtkPaned* client_paned;
 	GtkFrame* bottom_frame;
@@ -1525,7 +1525,7 @@ void app_window_go_fullscreen (AppWindow* self, Page* page);
 #define RESOURCES_OK_LABEL _ ("_OK")
 gboolean app_dirs_is_in_import_dir (GFile* file);
 GtkResponseType copy_files_dialog (void);
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library);
+static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse);
 static void _g_free0_ (gpointer var);
 static void _g_slist_free__g_free0_ (GSList* self);
 GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
@@ -1554,12 +1554,6 @@ CommandManager* app_window_get_command_manager (void);
 void command_manager_reset (CommandManager* self);
 SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
-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;
 void saved_search_dialog_show (SavedSearchDialog* self);
 DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
@@ -1571,7 +1565,7 @@ static void library_window_on_clear_search (LibraryWindow* self);
 void search_filter_actions_reset (SearchFilterActions* self);
 gint library_window_get_events_sort (LibraryWindow* self);
 void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort);
-void preferences_dialog_show (void);
+void preferences_dialog_show_preferences (void);
 void properties_update_properties (Properties* self, Page* page);
 void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display);
 static gboolean _variant_get6 (GVariant* value);
@@ -1623,8 +1617,8 @@ gpointer value_get_batch_import_job (const GValue* value);
 GType batch_import_job_get_type (void) G_GNUC_CONST;
 GType file_import_job_get_type (void) G_GNUC_CONST;
 void app_window_error_message (const gchar* message, GtkWindow* parent);
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library);
+FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
 gpointer batch_import_roll_ref (gpointer instance);
 void batch_import_roll_unref (gpointer instance);
 GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -1744,86 +1738,86 @@ const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (
 static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", NULL, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", NULL, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}};
 
 static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_page_created ((LibraryWindow*) self, entry, page);
-#line 1750 "LibraryWindow.c"
+#line 1744 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
-#line 1757 "LibraryWindow.c"
+#line 1751 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
-#line 1764 "LibraryWindow.c"
+#line 1758 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) {
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
-#line 1771 "LibraryWindow.c"
+#line 1765 "LibraryWindow.c"
 }
 
 
 static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) {
-#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_extended_properties ((LibraryWindow*) self);
-#line 1778 "LibraryWindow.c"
+#line 1772 "LibraryWindow.c"
 }
 
 
 static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) {
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_extended_properties ((LibraryWindow*) self);
-#line 1785 "LibraryWindow.c"
+#line 1779 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
-#line 1792 "LibraryWindow.c"
+#line 1786 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_media_altered ((LibraryWindow*) self);
-#line 1799 "LibraryWindow.c"
+#line 1793 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) {
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
-#line 1806 "LibraryWindow.c"
+#line 1800 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
-#line 1813 "LibraryWindow.c"
+#line 1807 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
-#line 1820 "LibraryWindow.c"
+#line 1814 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_camera_added ((LibraryWindow*) self, camera);
-#line 1827 "LibraryWindow.c"
+#line 1821 "LibraryWindow.c"
 }
 
 
@@ -1852,121 +1846,121 @@ GType library_window_target_type_get_type (void) {
 
 
 static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_file_import ((LibraryWindow*) self);
-#line 1858 "LibraryWindow.c"
+#line 1852 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_external_library_import ((LibraryWindow*) self);
-#line 1865 "LibraryWindow.c"
+#line 1859 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_preferences ((LibraryWindow*) self);
-#line 1872 "LibraryWindow.c"
+#line 1866 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_empty_trash ((LibraryWindow*) self);
-#line 1879 "LibraryWindow.c"
+#line 1873 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_jump_to_event ((LibraryWindow*) self);
-#line 1886 "LibraryWindow.c"
+#line 1880 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_find ((LibraryWindow*) self);
-#line 1893 "LibraryWindow.c"
+#line 1887 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_new_search ((LibraryWindow*) self);
-#line 1900 "LibraryWindow.c"
+#line 1894 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
-#line 1907 "LibraryWindow.c"
+#line 1901 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
-#line 1914 "LibraryWindow.c"
+#line 1908 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
-#line 1921 "LibraryWindow.c"
+#line 1915 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
-#line 1928 "LibraryWindow.c"
+#line 1922 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
-#line 1935 "LibraryWindow.c"
+#line 1929 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
-#line 1942 "LibraryWindow.c"
+#line 1936 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
-#line 1949 "LibraryWindow.c"
+#line 1943 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
-#line 1956 "LibraryWindow.c"
+#line 1950 "LibraryWindow.c"
 }
 
 
 static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
-#line 1963 "LibraryWindow.c"
+#line 1957 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) {
-#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties_now ((LibraryWindow*) self);
-#line 1970 "LibraryWindow.c"
+#line 1964 "LibraryWindow.c"
 }
 
 
@@ -2023,119 +2017,119 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	CameraTable* _tmp56_;
 	CameraTable* _tmp57_;
 	GtkProgressBar* _tmp58_;
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	static const gchar* accels[] = {"<Primary>f", "F8", NULL};
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = (LibraryWindow*) app_window_construct (object_type);
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = sidebar_tree_new (LIBRARY_WINDOW_DND_TARGET_ENTRIES, G_N_ELEMENTS (LIBRARY_WINDOW_DND_TARGET_ENTRIES), GDK_ACTION_ASK, _library_window_external_drop_handler_sidebar_tree_external_drop_handler, self);
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->sidebar_tree = _tmp0_;
-#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0);
 #line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0);
+#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0);
 #line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0);
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->sidebar_tree;
-#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0);
 #line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0);
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0);
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->sidebar_tree;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->library_branch;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY);
 #line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY);
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->sidebar_tree;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->tags_branch;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS);
 #line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS);
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->sidebar_tree;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->folders_branch;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS);
 #line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS);
+#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->sidebar_tree;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->events_branch;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS);
 #line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS);
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->sidebar_tree;
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->camera_branch;
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS);
 #line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS);
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->sidebar_tree;
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->saved_search_branch;
-#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH);
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = extended_properties_window_new (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->extended_properties = _tmp17_;
 #line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->extended_properties = _tmp17_;
+#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->extended_properties;
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0);
 #line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0);
+#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->extended_properties;
-#line 172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0);
-#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = one_shot_scheduler_new ("LibraryWindow properties", _library_window_on_update_properties_now_one_shot_callback, self);
-#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = _tmp20_;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->search_actions;
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = search_filter_toolbar_new (_tmp21_);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp22_);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_toolbar = _tmp22_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->library_branch;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = library_branch_get_photos_entry (_tmp23_);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _tmp24_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = _tmp26_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_create_layout (self, _tmp27_);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp27_);
-#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_load_configuration (self);
-#line 2139 "LibraryWindow.c"
+#line 2133 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp28_;
@@ -2144,27 +2138,27 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 		GeeCollection* _tmp31_;
 		GeeIterator* _tmp32_;
 		GeeIterator* _tmp33_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = media_collection_registry_get_instance ();
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = media_collection_registry_get_all (_tmp29_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = _tmp30_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = _tmp32_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp31_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp29_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp33_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 2168 "LibraryWindow.c"
+#line 2162 "LibraryWindow.c"
 			GeeIterator* _tmp34_;
 			gboolean _tmp35_;
 			MediaSourceCollection* media_sources = NULL;
@@ -2172,178 +2166,178 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 			gpointer _tmp37_;
 			MediaSourceCollection* _tmp38_;
 			MediaSourceCollection* _tmp39_;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = _media_sources_it;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp35_ = gee_iterator_next (_tmp34_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp35_) {
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 2184 "LibraryWindow.c"
+#line 2178 "LibraryWindow.c"
 			}
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp36_ = _media_sources_it;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp37_ = gee_iterator_get (_tmp36_);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp37_;
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp37_;
+#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp38_ = media_sources;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
 #line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
+#line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp39_ = media_sources;
-#line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 2202 "LibraryWindow.c"
+#line 2196 "LibraryWindow.c"
 		}
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 2206 "LibraryWindow.c"
+#line 2200 "LibraryWindow.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = g_new0 (GtkTargetEntry, 2);
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[0] = _tmp40_;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_[1] = _tmp41_;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = _tmp42_;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets_length1 = 2;
-#line 193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = main_window_dnd_targets;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43__length1 = main_window_dnd_targets_length1;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = metadata_writer_get_instance ();
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = _tmp44_;
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
-#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp45_);
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = library_monitor_pool_get_instance ();
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = _tmp46_;
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = library_monitor_pool_get_monitor (_tmp47_);
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = _tmp48_;
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp47_);
-#line 204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp49_;
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp49_;
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp50_ = monitor;
-#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp50_ != NULL) {
-#line 2254 "LibraryWindow.c"
+#line 2248 "LibraryWindow.c"
 		LibraryMonitor* _tmp51_;
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp51_ = monitor;
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_installed (self, _tmp51_);
-#line 2260 "LibraryWindow.c"
+#line 2254 "LibraryWindow.c"
 	}
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp52_ = library_monitor_pool_get_instance ();
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp53_ = _tmp52_;
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
-#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp53_);
 #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp53_);
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = library_monitor_pool_get_instance ();
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp55_ = _tmp54_;
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
-#line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp55_);
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp56_ = camera_table_get_instance ();
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp57_ = _tmp56_;
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
-#line 211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp57_);
-#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp58_ = self->priv->background_progress_bar;
-#line 213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_show_text (_tmp58_, TRUE);
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	application_set_accels_for_action ("win.CommonDisplaySearchbar", accels, G_N_ELEMENTS (accels));
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 2298 "LibraryWindow.c"
+#line 2292 "LibraryWindow.c"
 }
 
 
 LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) {
-#line 152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
-#line 2305 "LibraryWindow.c"
+#line 2299 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) {
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
-#line 2312 "LibraryWindow.c"
+#line 2306 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2319 "LibraryWindow.c"
+#line 2313 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) {
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2326 "LibraryWindow.c"
+#line 2320 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) {
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
-#line 2333 "LibraryWindow.c"
+#line 2327 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) {
-#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self);
-#line 2340 "LibraryWindow.c"
+#line 2334 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
-#line 2347 "LibraryWindow.c"
+#line 2341 "LibraryWindow.c"
 }
 
 
@@ -2359,51 +2353,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li
 	LibraryMonitor* _tmp8_;
 	LibraryMonitor* _tmp9_;
 	LibraryMonitor* _tmp10_;
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:250: on_library_monitor_installed: %s", _tmp4_);
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp4_);
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
 #line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = monitor;
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
 #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
+#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
 #line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = monitor;
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
 #line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
 #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = monitor;
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0);
-#line 2407 "LibraryWindow.c"
+#line 2401 "LibraryWindow.c"
 }
 
 
@@ -2425,84 +2419,84 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li
 	guint _tmp14_;
 	LibraryMonitor* _tmp15_;
 	guint _tmp16_;
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:261: on_library_monitor_destroyed: %s", _tmp4_);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp4_);
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
 #line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE);
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
 #line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
+#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE);
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
 #line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
+#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = monitor;
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
 #line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
+#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = monitor;
-#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE);
-#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
 #line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
+#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = monitor;
-#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE);
-#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self);
-#line 2485 "LibraryWindow.c"
+#line 2479 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new1 (gboolean value) {
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2492 "LibraryWindow.c"
+#line 2486 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new2 (gboolean value) {
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2499 "LibraryWindow.c"
+#line 2493 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new3 (gboolean value) {
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2506 "LibraryWindow.c"
+#line 2500 "LibraryWindow.c"
 }
 
 
@@ -2523,71 +2517,71 @@ static void library_window_real_add_actions (AppWindow* base) {
 	GAction* _tmp12_;
 	gboolean _tmp13_;
 	GVariant* _tmp14_;
-#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self);
+	APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
 #line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self);
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_actions;
-#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_);
-#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_actions;
-#line 295 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp2_, _tmp1_, _tmp3_);
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _variant_new1 (_tmp7_);
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp4_, _tmp8_);
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp6_);
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp6_);
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar");
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_is_sidebar_visible (self);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _variant_new2 (_tmp10_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp9_, _tmp11_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp11_);
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp11_);
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar");
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = library_window_is_toolbar_visible (self);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _variant_new3 (_tmp13_);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp12_, _tmp14_);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp14_);
-#line 2577 "LibraryWindow.c"
+#line 2571 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
-#line 2584 "LibraryWindow.c"
+#line 2578 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
-#line 2591 "LibraryWindow.c"
+#line 2585 "LibraryWindow.c"
 }
 
 
@@ -2600,23 +2594,23 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 	SearchFilterActions* _tmp18_;
 	Page* _tmp19_;
 	Page* _tmp20_;
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp0_, _tmp1_);
-#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = old_page;
-#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 2620 "LibraryWindow.c"
+#line 2614 "LibraryWindow.c"
 		Page* _tmp3_;
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
@@ -2625,126 +2619,126 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 		ViewCollection* _tmp8_;
 		ViewCollection* _tmp9_;
 		guint _tmp10_;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = old_page;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp5_);
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_data_collection_unref0 (_tmp5_);
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = old_page;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self);
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 2653 "LibraryWindow.c"
+#line 2647 "LibraryWindow.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = new_page;
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 2659 "LibraryWindow.c"
+#line 2653 "LibraryWindow.c"
 		Page* _tmp12_;
 		ViewCollection* _tmp13_;
 		ViewCollection* _tmp14_;
 		Page* _tmp15_;
 		ViewCollection* _tmp16_;
 		ViewCollection* _tmp17_;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = new_page;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = page_get_view (_tmp12_);
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_connect_object (_tmp14_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0);
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp14_);
 #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_data_collection_unref0 (_tmp14_);
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = new_page;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = page_get_view (_tmp15_);
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 2686 "LibraryWindow.c"
+#line 2680 "LibraryWindow.c"
 	}
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->search_actions;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = old_page;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = new_page;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_);
-#line 2696 "LibraryWindow.c"
+#line 2690 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_refreshed ((LibraryWindow*) self);
-#line 2703 "LibraryWindow.c"
+#line 2697 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_;
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_VIEW_FILTER (filter));
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0);
-#line 2717 "LibraryWindow.c"
+#line 2711 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_;
 	guint _tmp1_;
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_VIEW_FILTER (filter));
+#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self);
-#line 2734 "LibraryWindow.c"
+#line 2728 "LibraryWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2741 "LibraryWindow.c"
+#line 2735 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new4 (gboolean value) {
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2748 "LibraryWindow.c"
+#line 2742 "LibraryWindow.c"
 }
 
 
@@ -2759,56 +2753,56 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 	GAction* _tmp6_;
 	GAction* _tmp7_;
 	GAction* _tmp8_;
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_are_items_filtered_out (_tmp3_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = !_tmp4_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp5_) {
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp5_) {
+#line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 2785 "LibraryWindow.c"
+#line 2779 "LibraryWindow.c"
 	}
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp7_;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 2797 "LibraryWindow.c"
+#line 2791 "LibraryWindow.c"
 		GAction* _tmp9_;
 		GVariant* _tmp10_;
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = action;
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _variant_new4 (TRUE);
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_action_change_state (_tmp9_, _tmp10_);
-#line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp10_);
-#line 2808 "LibraryWindow.c"
+#line 2802 "LibraryWindow.c"
 	}
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 2812 "LibraryWindow.c"
+#line 2806 "LibraryWindow.c"
 }
 
 
@@ -2832,87 +2826,87 @@ static void library_window_real_show_all (GtkWidget* base) {
 	gboolean _tmp15_;
 	CheckerboardPage* _tmp16_;
 	gboolean _tmp17_;
-#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	GTK_WIDGET_CLASS (library_window_parent_class)->show_all (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget));
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_common_action (_tmp1_, "CommonDisplayBasicProperties", TRUE);
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_properties_action = _tmp3_;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = basic_properties_action;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp4_ != NULL, "basic_properties_action != null");
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = basic_properties_action;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_action_get_state (_tmp5_);
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_variant_get_boolean (_tmp7_);
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = !_tmp8_;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 2870 "LibraryWindow.c"
+#line 2864 "LibraryWindow.c"
 		GtkFrame* _tmp10_;
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = self->priv->bottom_frame;
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2876 "LibraryWindow.c"
+#line 2870 "LibraryWindow.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL;
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == NULL) {
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2886 "LibraryWindow.c"
+#line 2880 "LibraryWindow.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp12_;
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp12_;
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = current_page;
-#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_ != NULL) {
-#line 2894 "LibraryWindow.c"
+#line 2888 "LibraryWindow.c"
 		CheckerboardPage* _tmp14_;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = current_page;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, _tmp14_);
-#line 2900 "LibraryWindow.c"
+#line 2894 "LibraryWindow.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = library_window_should_show_search_bar (self);
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = current_page;
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp15_, _tmp16_);
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = library_window_is_sidebar_visible (self);
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, _tmp17_);
-#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_properties_action);
-#line 2916 "LibraryWindow.c"
+#line 2910 "LibraryWindow.c"
 }
 
 
@@ -2921,77 +2915,77 @@ LibraryWindow* library_window_get_app (void) {
 	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
 	LibraryWindow* _tmp2_;
-#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW), "instance is LibraryWindow");
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_window_instance;
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_WINDOW, LibraryWindow));
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2937 "LibraryWindow.c"
+#line 2931 "LibraryWindow.c"
 }
 
 
 gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 	gboolean result = FALSE;
-#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (uri != NULL, FALSE);
-#line 2945 "LibraryWindow.c"
+#line 2939 "LibraryWindow.c"
 	{
 		const gchar** scheme_collection = NULL;
 		gint scheme_collection_length1 = 0;
 		gint _scheme_collection_size_ = 0;
 		gint scheme_it = 0;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection = LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) {
-#line 2957 "LibraryWindow.c"
+#line 2951 "LibraryWindow.c"
 			gchar* _tmp0_;
 			gchar* scheme = NULL;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			scheme = _tmp0_;
-#line 2964 "LibraryWindow.c"
+#line 2958 "LibraryWindow.c"
 			{
 				const gchar* _tmp1_;
 				const gchar* _tmp2_;
 				gboolean _tmp3_;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp1_ = uri;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp2_ = scheme;
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_);
-#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				if (_tmp3_) {
 #line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				if (_tmp3_) {
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					result = TRUE;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (scheme);
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					return result;
-#line 2983 "LibraryWindow.c"
+#line 2977 "LibraryWindow.c"
 				}
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (scheme);
-#line 2987 "LibraryWindow.c"
+#line 2981 "LibraryWindow.c"
 			}
 		}
 	}
-#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2995 "LibraryWindow.c"
+#line 2989 "LibraryWindow.c"
 }
 
 
@@ -2999,15 +2993,15 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
 	LibraryWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_LIBRARY_ROLE);
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3011 "LibraryWindow.c"
+#line 3005 "LibraryWindow.c"
 }
 
 
@@ -3017,40 +3011,40 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
 	TagsSidebarEntry* _tmp3_;
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_TAG (tag));
 #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_TAG (tag));
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp2_;
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3037 "LibraryWindow.c"
+#line 3031 "LibraryWindow.c"
 		SidebarTree* _tmp4_;
 		TagsSidebarEntry* _tmp5_;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3046 "LibraryWindow.c"
+#line 3040 "LibraryWindow.c"
 	} else {
-#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:387: No tag entry found for rename");
-#line 3050 "LibraryWindow.c"
+#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:388: No tag entry found for rename");
+#line 3044 "LibraryWindow.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3054 "LibraryWindow.c"
+#line 3048 "LibraryWindow.c"
 }
 
 
@@ -3060,40 +3054,40 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 	Event* _tmp1_;
 	EventsEventEntry* _tmp2_;
 	EventsEventEntry* _tmp3_;
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_EVENT (event));
 #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_EVENT (event));
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp2_;
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3080 "LibraryWindow.c"
+#line 3074 "LibraryWindow.c"
 		SidebarTree* _tmp4_;
 		EventsEventEntry* _tmp5_;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3089 "LibraryWindow.c"
+#line 3083 "LibraryWindow.c"
 	} else {
-#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:395: No event entry found for rename");
-#line 3093 "LibraryWindow.c"
+#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:396: No event entry found for rename");
+#line 3087 "LibraryWindow.c"
 	}
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3097 "LibraryWindow.c"
+#line 3091 "LibraryWindow.c"
 }
 
 
@@ -3103,40 +3097,40 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 	SavedSearch* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
 	SearchesSidebarEntry* _tmp3_;
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_SAVED_SEARCH (search));
 #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_SAVED_SEARCH (search));
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
 #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	entry = _tmp2_;
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 3123 "LibraryWindow.c"
+#line 3117 "LibraryWindow.c"
 		SidebarTree* _tmp4_;
 		SearchesSidebarEntry* _tmp5_;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3132 "LibraryWindow.c"
+#line 3126 "LibraryWindow.c"
 	} else {
-#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:403: No search entry found for rename");
-#line 3136 "LibraryWindow.c"
+#line 404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:404: No search entry found for rename");
+#line 3130 "LibraryWindow.c"
 	}
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3140 "LibraryWindow.c"
+#line 3134 "LibraryWindow.c"
 }
 
 
@@ -3151,37 +3145,37 @@ static void library_window_real_on_quit (AppWindow* base) {
 	GtkPaned* _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, &_tmp3_);
-#line 407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->client_paned;
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_paned_get_position (_tmp6_);
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_);
-#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 3185 "LibraryWindow.c"
+#line 3179 "LibraryWindow.c"
 }
 
 
@@ -3198,105 +3192,105 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 	Photo* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
 	GeeList* _tmp12_;
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
-#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
 #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
+#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = view;
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ > 0) {
-#line 3218 "LibraryWindow.c"
+#line 3212 "LibraryWindow.c"
 		ViewCollection* _tmp5_;
 		GeeList* _tmp6_;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = view;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp6_;
-#line 3229 "LibraryWindow.c"
+#line 3223 "LibraryWindow.c"
 	} else {
 		ViewCollection* _tmp7_;
 		GeeList* _tmp8_;
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view;
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO);
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp8_;
-#line 3241 "LibraryWindow.c"
+#line 3235 "LibraryWindow.c"
 	}
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sources = _tmp9_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = sources;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
-#line 3251 "LibraryWindow.c"
+#line 3245 "LibraryWindow.c"
 		GeeList* _tmp13_;
 		gint _tmp14_;
 		gint _tmp15_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = sources;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp15_ != 0;
-#line 3263 "LibraryWindow.c"
+#line 3257 "LibraryWindow.c"
 	} else {
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = FALSE;
-#line 3267 "LibraryWindow.c"
+#line 3261 "LibraryWindow.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
-#line 3271 "LibraryWindow.c"
+#line 3265 "LibraryWindow.c"
 		GeeList* _tmp16_;
 		gpointer _tmp17_;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = sources;
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = gee_list_get (_tmp16_, 0);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo);
-#line 3282 "LibraryWindow.c"
+#line 3276 "LibraryWindow.c"
 	} else {
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = NULL;
-#line 3288 "LibraryWindow.c"
+#line 3282 "LibraryWindow.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp10_;
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sources);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3300 "LibraryWindow.c"
+#line 3294 "LibraryWindow.c"
 }
 
 
@@ -3308,27 +3302,27 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	Page* _tmp0_;
 	Page* _tmp8_;
 	Page* _tmp30_;
-#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), FALSE);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_collection);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_collection = NULL;
 #line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_collection = NULL;
+#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_start);
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_start = NULL;
 #line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_start = NULL;
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_vala_view_collection);
-#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_view_collection = NULL;
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
-#line 3332 "LibraryWindow.c"
+#line 3326 "LibraryWindow.c"
 		Page* _tmp1_;
 		CollectionPage* _tmp2_;
 		Photo* photo = NULL;
@@ -3337,117 +3331,117 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp5_;
 		Photo* _tmp6_;
 		Photo* _tmp7_;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = page;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp2_;
 #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = _tmp2_;
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _vala_collection;
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_);
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp4_;
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		photo = _tmp4_;
+#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = photo;
-#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp5_ == NULL) {
 #line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp5_ == NULL) {
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3367 "LibraryWindow.c"
+#line 3361 "LibraryWindow.c"
 			} else {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3371 "LibraryWindow.c"
+#line 3365 "LibraryWindow.c"
 			}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3377 "LibraryWindow.c"
+#line 3371 "LibraryWindow.c"
 			} else {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3381 "LibraryWindow.c"
+#line 3375 "LibraryWindow.c"
 			}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3387 "LibraryWindow.c"
+#line 3381 "LibraryWindow.c"
 			} else {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3391 "LibraryWindow.c"
+#line 3385 "LibraryWindow.c"
 			}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3395 "LibraryWindow.c"
+#line 3389 "LibraryWindow.c"
 		}
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = photo;
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp7_;
 #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp7_;
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3417 "LibraryWindow.c"
+#line 3411 "LibraryWindow.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3421 "LibraryWindow.c"
+#line 3415 "LibraryWindow.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3427 "LibraryWindow.c"
+#line 3421 "LibraryWindow.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3431 "LibraryWindow.c"
+#line 3425 "LibraryWindow.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3437 "LibraryWindow.c"
+#line 3431 "LibraryWindow.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3441 "LibraryWindow.c"
+#line 3435 "LibraryWindow.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3445 "LibraryWindow.c"
+#line 3439 "LibraryWindow.c"
 	}
-#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page;
-#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 3451 "LibraryWindow.c"
+#line 3445 "LibraryWindow.c"
 		ViewCollection* view = NULL;
 		Page* _tmp9_;
 		ViewCollection* _tmp10_;
@@ -3473,291 +3467,291 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp27_;
 		Photo* _tmp28_;
 		Photo* _tmp29_;
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page;
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_get_view (_tmp9_);
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		view = _tmp10_;
 #line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		view = _tmp10_;
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = view;
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp12_ == 0) {
 #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp12_ == 0) {
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3497 "LibraryWindow.c"
+#line 3491 "LibraryWindow.c"
 			} else {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3501 "LibraryWindow.c"
+#line 3495 "LibraryWindow.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3507 "LibraryWindow.c"
+#line 3501 "LibraryWindow.c"
 			} else {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3511 "LibraryWindow.c"
+#line 3505 "LibraryWindow.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3517 "LibraryWindow.c"
+#line 3511 "LibraryWindow.c"
 			} else {
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3521 "LibraryWindow.c"
+#line 3515 "LibraryWindow.c"
 			}
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3525 "LibraryWindow.c"
+#line 3519 "LibraryWindow.c"
 		}
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = view;
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), 0);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = data_view_get_source (_tmp15_);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp15_);
-#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		event = _tmp17_;
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		event = _tmp17_;
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = event;
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp18_ == NULL) {
 #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp18_ == NULL) {
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3555 "LibraryWindow.c"
+#line 3549 "LibraryWindow.c"
 			} else {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3559 "LibraryWindow.c"
+#line 3553 "LibraryWindow.c"
 			}
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3565 "LibraryWindow.c"
+#line 3559 "LibraryWindow.c"
 			} else {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3569 "LibraryWindow.c"
+#line 3563 "LibraryWindow.c"
 			}
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3575 "LibraryWindow.c"
+#line 3569 "LibraryWindow.c"
 			} else {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3579 "LibraryWindow.c"
+#line 3573 "LibraryWindow.c"
 			}
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3583 "LibraryWindow.c"
+#line 3577 "LibraryWindow.c"
 		}
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = self->priv->events_branch;
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = event;
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_);
-#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		entry = _tmp21_;
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		entry = _tmp21_;
+#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = entry;
-#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp22_ == NULL) {
 #line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp22_ == NULL) {
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3609 "LibraryWindow.c"
+#line 3603 "LibraryWindow.c"
 			} else {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3613 "LibraryWindow.c"
+#line 3607 "LibraryWindow.c"
 			}
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3619 "LibraryWindow.c"
+#line 3613 "LibraryWindow.c"
 			} else {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3623 "LibraryWindow.c"
+#line 3617 "LibraryWindow.c"
 			}
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3629 "LibraryWindow.c"
+#line 3623 "LibraryWindow.c"
 			} else {
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3633 "LibraryWindow.c"
+#line 3627 "LibraryWindow.c"
 			}
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3637 "LibraryWindow.c"
+#line 3631 "LibraryWindow.c"
 		}
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = entry;
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
 #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = _vala_collection;
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_);
-#line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp26_;
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		photo = _tmp26_;
+#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = photo;
-#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp27_ == NULL) {
 #line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp27_ == NULL) {
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3671 "LibraryWindow.c"
+#line 3665 "LibraryWindow.c"
 			} else {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3675 "LibraryWindow.c"
+#line 3669 "LibraryWindow.c"
 			}
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3681 "LibraryWindow.c"
+#line 3675 "LibraryWindow.c"
 			} else {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3685 "LibraryWindow.c"
+#line 3679 "LibraryWindow.c"
 			}
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3691 "LibraryWindow.c"
+#line 3685 "LibraryWindow.c"
 			} else {
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3695 "LibraryWindow.c"
+#line 3689 "LibraryWindow.c"
 			}
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3699 "LibraryWindow.c"
+#line 3693 "LibraryWindow.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = photo;
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _g_object_ref0 (_tmp28_);
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp29_;
 #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp29_;
+#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (event);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3727 "LibraryWindow.c"
+#line 3721 "LibraryWindow.c"
 		} else {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3731 "LibraryWindow.c"
+#line 3725 "LibraryWindow.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3737 "LibraryWindow.c"
+#line 3731 "LibraryWindow.c"
 		} else {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3741 "LibraryWindow.c"
+#line 3735 "LibraryWindow.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3747 "LibraryWindow.c"
+#line 3741 "LibraryWindow.c"
 		} else {
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3751 "LibraryWindow.c"
+#line 3745 "LibraryWindow.c"
 		}
-#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3755 "LibraryWindow.c"
+#line 3749 "LibraryWindow.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = page;
-#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 3761 "LibraryWindow.c"
+#line 3755 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
 		Page* _tmp31_;
 		LibraryPhotoPage* _tmp32_;
@@ -3773,207 +3767,207 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp41_;
 		LibraryPhotoPage* _tmp42_;
 		ViewCollection* _tmp43_;
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = page;
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo_page = _tmp32_;
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = photo_page;
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp34_ = library_photo_page_get_controller_page (_tmp33_);
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		controller = _tmp34_;
 #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		controller = _tmp34_;
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = controller;
-#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp35_ == NULL) {
 #line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp35_ == NULL) {
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3803 "LibraryWindow.c"
+#line 3797 "LibraryWindow.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3807 "LibraryWindow.c"
+#line 3801 "LibraryWindow.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3813 "LibraryWindow.c"
+#line 3807 "LibraryWindow.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3817 "LibraryWindow.c"
+#line 3811 "LibraryWindow.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3823 "LibraryWindow.c"
+#line 3817 "LibraryWindow.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3827 "LibraryWindow.c"
+#line 3821 "LibraryWindow.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3831 "LibraryWindow.c"
+#line 3825 "LibraryWindow.c"
 		}
-#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = photo_page;
-#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp37_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (!_tmp37_) {
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (!_tmp37_) {
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3849 "LibraryWindow.c"
+#line 3843 "LibraryWindow.c"
 			} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3853 "LibraryWindow.c"
+#line 3847 "LibraryWindow.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3859 "LibraryWindow.c"
+#line 3853 "LibraryWindow.c"
 			} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3863 "LibraryWindow.c"
+#line 3857 "LibraryWindow.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3869 "LibraryWindow.c"
+#line 3863 "LibraryWindow.c"
 			} else {
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3873 "LibraryWindow.c"
+#line 3867 "LibraryWindow.c"
 			}
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3877 "LibraryWindow.c"
+#line 3871 "LibraryWindow.c"
 		}
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = controller;
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp39_ = _g_object_ref0 (_tmp38_);
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp39_;
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_collection = _tmp39_;
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp40_ = photo_page;
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp41_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp41_;
 #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_vala_start = _tmp41_;
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp42_ = photo_page;
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page));
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = _tmp43_;
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (controller);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo_page);
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3913 "LibraryWindow.c"
+#line 3907 "LibraryWindow.c"
 		} else {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3917 "LibraryWindow.c"
+#line 3911 "LibraryWindow.c"
 		}
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3923 "LibraryWindow.c"
+#line 3917 "LibraryWindow.c"
 		} else {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3927 "LibraryWindow.c"
+#line 3921 "LibraryWindow.c"
 		}
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3933 "LibraryWindow.c"
+#line 3927 "LibraryWindow.c"
 		} else {
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3937 "LibraryWindow.c"
+#line 3931 "LibraryWindow.c"
 		}
-#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3941 "LibraryWindow.c"
+#line 3935 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (collection) {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*collection = _vala_collection;
-#line 3949 "LibraryWindow.c"
+#line 3943 "LibraryWindow.c"
 	} else {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 3953 "LibraryWindow.c"
+#line 3947 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (start) {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*start = _vala_start;
-#line 3959 "LibraryWindow.c"
+#line 3953 "LibraryWindow.c"
 	} else {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 3963 "LibraryWindow.c"
+#line 3957 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection) {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*view_collection = _vala_view_collection;
-#line 3969 "LibraryWindow.c"
+#line 3963 "LibraryWindow.c"
 	} else {
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 3973 "LibraryWindow.c"
+#line 3967 "LibraryWindow.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3977 "LibraryWindow.c"
+#line 3971 "LibraryWindow.c"
 }
 
 
@@ -3996,97 +3990,97 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 	ViewCollection* _tmp9_;
 	LibraryWindowFullscreenPhotoPage* _tmp10_;
 	LibraryWindowFullscreenPhotoPage* _tmp11_;
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp0_;
 #line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp0_;
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = current_page;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == NULL) {
 #line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp1_ == NULL) {
+#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4014 "LibraryWindow.c"
+#line 4008 "LibraryWindow.c"
 	}
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = NULL;
 #line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	view = NULL;
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = current_page;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = library_window_get_fullscreen_photo (self, _tmp2_, &_tmp3_, &_tmp4_, &_tmp5_);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp3_;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp4_;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp5_;
-#line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!_tmp6_) {
 #line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (!_tmp6_) {
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (start);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (collection);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4046 "LibraryWindow.c"
+#line 4040 "LibraryWindow.c"
 	}
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = collection;
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = start;
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = view;
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_fullscreen_photo_page_new (_tmp7_, _tmp8_, _tmp9_);
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fs_photo = _tmp10_;
-#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = fs_photo;
-#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page));
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (fs_photo);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 4074 "LibraryWindow.c"
+#line 4068 "LibraryWindow.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	var = (g_free (var), NULL);
-#line 4081 "LibraryWindow.c"
+#line 4075 "LibraryWindow.c"
 }
 
 
 static void _g_slist_free__g_free0_ (GSList* self) {
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_foreach (self, (GFunc) _g_free0_, NULL);
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_free (self);
-#line 4090 "LibraryWindow.c"
+#line 4084 "LibraryWindow.c"
 }
 
 
@@ -4097,145 +4091,196 @@ static void library_window_on_file_import (LibraryWindow* self) {
 	GtkFileChooserDialog* _tmp2_;
 	GtkFileChooserDialog* _tmp3_;
 	const gchar* _tmp4_;
+	GtkCheckButton* recursive = NULL;
+	GtkCheckButton* _tmp5_;
+	GtkCheckButton* _tmp6_;
+	gboolean _tmp7_;
+	GtkFileChooserDialog* _tmp8_;
+	GtkCheckButton* _tmp9_;
 	gint response = 0;
-	GtkFileChooserDialog* _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	GtkFileChooserDialog* _tmp22_;
-	gchar* _tmp23_;
-	GtkFileChooserDialog* _tmp24_;
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+	GtkFileChooserDialog* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	GtkFileChooserDialog* _tmp31_;
+	gchar* _tmp32_;
+	GtkCheckButton* _tmp33_;
+	gboolean _tmp34_;
+	gboolean _tmp35_;
+	GtkFileChooserDialog* _tmp36_;
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_ ("Import From Folder"), NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = _tmp0_;
-#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = import_dialog;
-#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
 #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = import_dialog;
-#line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = import_dialog;
-#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->import_dir;
-#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_);
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = import_dialog;
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_dialog_get_type (), GtkDialog));
-#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	response = _tmp6_;
+#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Recurse Into Subfolders"));
+#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp5_);
+#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	recursive = _tmp5_;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = response;
+	_tmp6_ = recursive;
 #line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp7_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4140 "LibraryWindow.c"
-		GtkResponseType _tmp8_ = 0;
-		GtkFileChooserDialog* _tmp9_;
-		gchar* _tmp10_;
-		gchar* _tmp11_;
-		GFile* _tmp12_;
-		GFile* _tmp13_;
-		gboolean _tmp14_;
-		gboolean _tmp15_;
-		GtkResponseType copy_files_response = 0;
-		GtkResponseType _tmp17_;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = import_dialog;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = _tmp10_;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = g_file_new_for_uri (_tmp11_);
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = _tmp12_;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = app_dirs_is_in_import_dir (_tmp13_);
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = _tmp14_;
+	_tmp7_ = self->priv->import_recursive;
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp7_);
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = import_dialog;
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp9_ = recursive;
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp13_);
+	_tmp10_ = import_dialog;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_free0 (_tmp11_);
+	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog));
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp15_) {
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp8_ = GTK_RESPONSE_REJECT;
-#line 4173 "LibraryWindow.c"
-		} else {
-			GtkResponseType _tmp16_;
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp16_ = copy_files_dialog ();
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp8_ = _tmp16_;
-#line 4180 "LibraryWindow.c"
-		}
-#line 518 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		copy_files_response = _tmp8_;
+	response = _tmp11_;
+#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = response;
+#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp12_ == ((gint) GTK_RESPONSE_OK)) {
+#line 4161 "LibraryWindow.c"
+		GtkFileChooserDialog* _tmp13_;
+		GtkResponseType _tmp14_ = 0;
+		GtkFileChooserDialog* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
+		GFile* _tmp18_;
+		GFile* _tmp19_;
+		gboolean _tmp20_;
+		gboolean _tmp21_;
+		GtkResponseType copy_files_response = 0;
+		GtkResponseType _tmp23_;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = copy_files_response;
+		_tmp13_ = import_dialog;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp17_ != GTK_RESPONSE_CANCEL) {
-#line 4188 "LibraryWindow.c"
-			GtkFileChooserDialog* _tmp18_;
-			GSList* _tmp19_;
-			GSList* _tmp20_;
-			GtkResponseType _tmp21_;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp18_ = import_dialog;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp19_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp20_ = _tmp19_;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp21_ = copy_files_response;
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			library_window_dispatch_import_jobs (self, _tmp20_, "folders", _tmp21_ == GTK_RESPONSE_ACCEPT);
-#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			__g_slist_free__g_free0_0 (_tmp20_);
-#line 4205 "LibraryWindow.c"
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp15_ = import_dialog;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp16_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp17_ = _tmp16_;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp18_ = g_file_new_for_uri (_tmp17_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp19_ = _tmp18_;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp20_ = app_dirs_is_in_import_dir (_tmp19_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp21_ = _tmp20_;
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_object_unref0 (_tmp19_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_free0 (_tmp17_);
+#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp21_) {
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp14_ = GTK_RESPONSE_REJECT;
+#line 4199 "LibraryWindow.c"
+		} else {
+			GtkResponseType _tmp22_;
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp22_ = copy_files_dialog ();
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp14_ = _tmp22_;
+#line 4206 "LibraryWindow.c"
 		}
-	}
-#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = import_dialog;
-#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		copy_files_response = _tmp14_;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (self->priv->import_dir);
+		_tmp23_ = copy_files_response;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_dir = _tmp23_;
+		if (_tmp23_ != GTK_RESPONSE_CANCEL) {
+#line 4214 "LibraryWindow.c"
+			GtkFileChooserDialog* _tmp24_;
+			GSList* _tmp25_;
+			GSList* _tmp26_;
+			GtkResponseType _tmp27_;
+			GtkCheckButton* _tmp28_;
+			gboolean _tmp29_;
+			gboolean _tmp30_;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp24_ = import_dialog;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp25_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp26_ = _tmp25_;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp27_ = copy_files_response;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp28_ = recursive;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp29_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp30_ = _tmp29_;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = import_dialog;
+			library_window_dispatch_import_jobs (self, _tmp26_, "folders", _tmp27_ == GTK_RESPONSE_ACCEPT, _tmp30_);
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			__g_slist_free__g_free0_0 (_tmp26_);
+#line 4240 "LibraryWindow.c"
+		}
+	}
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp31_ = import_dialog;
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp32_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_free0 (self->priv->import_dir);
+#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_dir = _tmp32_;
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp33_ = recursive;
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp34_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp35_ = _tmp34_;
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_recursive = _tmp35_;
+#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp36_ = import_dialog;
+#line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (recursive);
+#line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4222 "LibraryWindow.c"
+#line 4267 "LibraryWindow.c"
 }
 
 
 static void library_window_on_external_library_import (LibraryWindow* self) {
 	GtkDialog* import_dialog = NULL;
 	DataImportsUIDataImportsDialog* _tmp0_;
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_get_or_create_instance ();
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_dialog_get_type (), GtkDialog);
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 542 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_dialog_run (import_dialog);
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4239 "LibraryWindow.c"
+#line 4284 "LibraryWindow.c"
 }
 
 
@@ -4245,27 +4290,27 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
 	Page* _tmp1_;
 	gboolean is_checkerboard = FALSE;
 	Page* _tmp2_;
-#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_, _tmp1_);
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = new_page;
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
-#line 544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard);
-#line 4269 "LibraryWindow.c"
+#line 4314 "LibraryWindow.c"
 }
 
 
@@ -4283,61 +4328,61 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa
 	Page* _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL);
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp1_;
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp2_;
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	can_fullscreen = _tmp3_;
-#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_can_empty_trash (self);
-#line 555 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp4_);
-#line 556 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE);
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_window_can_jump_to_event (self);
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp5_);
-#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen);
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = selected_count;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = count;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp6_, _tmp7_, _tmp8_);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 4329 "LibraryWindow.c"
+#line 4374 "LibraryWindow.c"
 }
 
 
 static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_empty_trash (self);
-#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_);
-#line 4341 "LibraryWindow.c"
+#line 4386 "LibraryWindow.c"
 }
 
 
@@ -4346,33 +4391,33 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
 	LibraryPhotoSourceCollection* _tmp1_;
 	gint _tmp2_;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ > 0) {
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
-#line 4360 "LibraryWindow.c"
+#line 4405 "LibraryWindow.c"
 	} else {
 		VideoSourceCollection* _tmp3_;
 		gint _tmp4_;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = video_global;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 4370 "LibraryWindow.c"
+#line 4415 "LibraryWindow.c"
 	}
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4376 "LibraryWindow.c"
+#line 4421 "LibraryWindow.c"
 }
 
 
@@ -4387,62 +4432,64 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 	GeeCollection* _tmp6_;
 	CommandManager* _tmp7_;
 	CommandManager* _tmp8_;
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
-#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	to_remove = _tmp0_;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp3_);
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = video_global;
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp6_);
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
-#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _ ("Empty Trash"), _ ("Emptying Trash…"));
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	command_manager_reset (_tmp8_);
-#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
-#line 4429 "LibraryWindow.c"
+#line 4474 "LibraryWindow.c"
 }
 
 
 static void library_window_on_new_search (LibraryWindow* self) {
 	SavedSearchDialog* _tmp0_;
 	SavedSearchDialog* _tmp1_;
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp0_);
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_saved_search_dialog_unref0 (_tmp1_);
-#line 4446 "LibraryWindow.c"
+#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp1_);
+#line 4493 "LibraryWindow.c"
 }
 
 
@@ -4455,115 +4502,115 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
 	gint _tmp5_;
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ == 1) {
-#line 4479 "LibraryWindow.c"
+#line 4526 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
 		ViewCollection* _tmp6_;
 		DataSource* _tmp7_;
 		DataSource* _tmp8_;
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view;
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		selected_source = _tmp7_;
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = selected_source;
-#line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) {
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = TRUE;
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (selected_source);
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 4502 "LibraryWindow.c"
+#line 4549 "LibraryWindow.c"
 		} else {
 			DataSource* _tmp9_;
-#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = selected_source;
-#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 4509 "LibraryWindow.c"
+#line 4556 "LibraryWindow.c"
 				ViewCollection* _tmp10_;
 				DataSource* _tmp11_;
 				MediaSource* _tmp12_;
 				Event* _tmp13_;
 				Event* _tmp14_;
 				gboolean _tmp15_;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp10_ = view;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp13_ = media_source_get_event (_tmp12_);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp14_ = _tmp13_;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp15_ = _tmp14_ != NULL;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp14_);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp12_);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = _tmp15_;
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4540 "LibraryWindow.c"
+#line 4587 "LibraryWindow.c"
 			} else {
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4550 "LibraryWindow.c"
+#line 4597 "LibraryWindow.c"
 			}
 		}
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
-#line 4555 "LibraryWindow.c"
+#line 4602 "LibraryWindow.c"
 	} else {
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 4563 "LibraryWindow.c"
+#line 4610 "LibraryWindow.c"
 	}
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4567 "LibraryWindow.c"
+#line 4614 "LibraryWindow.c"
 }
 
 
@@ -4584,98 +4631,98 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	Event* _tmp11_;
 	Event* _tmp12_;
 	gboolean _tmp13_;
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ != 1) {
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4612 "LibraryWindow.c"
+#line 4659 "LibraryWindow.c"
 	}
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = view;
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL;
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ == NULL) {
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4624 "LibraryWindow.c"
+#line 4671 "LibraryWindow.c"
 	}
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	media = _tmp8_;
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = media;
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == NULL) {
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (media);
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4638 "LibraryWindow.c"
+#line 4685 "LibraryWindow.c"
 	}
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = media;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = media_source_get_event (_tmp10_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = _tmp11_;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_ != NULL;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp12_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 4652 "LibraryWindow.c"
+#line 4699 "LibraryWindow.c"
 		MediaSource* _tmp14_;
 		Event* _tmp15_;
 		Event* _tmp16_;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = media_source_get_event (_tmp14_);
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_event (self, _tmp16_);
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp16_);
-#line 4666 "LibraryWindow.c"
+#line 4713 "LibraryWindow.c"
 	}
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
-#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4672 "LibraryWindow.c"
+#line 4719 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new5 (gboolean value) {
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4679 "LibraryWindow.c"
+#line 4726 "LibraryWindow.c"
 }
 
 
@@ -4685,57 +4732,57 @@ static void library_window_on_find (LibraryWindow* self) {
 	GAction* _tmp1_;
 	GVariant* _tmp2_;
 	SearchFilterToolbar* _tmp3_;
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _variant_new5 (TRUE);
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp2_);
-#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->search_toolbar;
-#line 619 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_take_focus (_tmp3_);
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 4709 "LibraryWindow.c"
+#line 4756 "LibraryWindow.c"
 }
 
 
 static void library_window_on_media_altered (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_jump_to_event (self);
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_);
-#line 4721 "LibraryWindow.c"
+#line 4768 "LibraryWindow.c"
 }
 
 
 static void library_window_on_clear_search (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->is_search_toolbar_visible;
-#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 4733 "LibraryWindow.c"
+#line 4780 "LibraryWindow.c"
 		SearchFilterActions* _tmp1_;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
-#line 4739 "LibraryWindow.c"
+#line 4786 "LibraryWindow.c"
 	}
 }
 
@@ -4747,19 +4794,19 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	GSimpleAction* _tmp1_;
 	gint _tmp2_ = 0;
 	GSimpleAction* _tmp3_;
-#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL);
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = action;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4763 "LibraryWindow.c"
+#line 4810 "LibraryWindow.c"
 		gint _tmp4_ = 0;
 		GSimpleAction* _tmp5_;
 		GVariant* _tmp6_;
@@ -4767,45 +4814,45 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 		GVariant* _tmp8_;
 		const gchar* _tmp9_;
 		gboolean _tmp10_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = action;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_action_get_type (), GAction));
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = g_variant_get_string (_tmp8_, NULL);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = g_strcmp0 (_tmp9_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_variant_unref0 (_tmp8_);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp10_) {
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 0;
-#line 4789 "LibraryWindow.c"
+#line 4836 "LibraryWindow.c"
 		} else {
-#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 1;
-#line 4793 "LibraryWindow.c"
+#line 4840 "LibraryWindow.c"
 		}
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp4_;
-#line 4797 "LibraryWindow.c"
+#line 4844 "LibraryWindow.c"
 	} else {
-#line 636 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = 1;
-#line 4801 "LibraryWindow.c"
+#line 4848 "LibraryWindow.c"
 	}
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4809 "LibraryWindow.c"
+#line 4856 "LibraryWindow.c"
 }
 
 
@@ -4816,38 +4863,38 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA
 	const gchar* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 639 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = value;
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0);
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = action;
-#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = value;
-#line 644 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 4842 "LibraryWindow.c"
+#line 4889 "LibraryWindow.c"
 }
 
 
 static void library_window_on_preferences (LibraryWindow* self) {
-#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	preferences_dialog_show ();
-#line 4851 "LibraryWindow.c"
+#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	preferences_dialog_show_preferences ();
+#line 4898 "LibraryWindow.c"
 }
 
 
@@ -4861,89 +4908,89 @@ static void library_window_on_display_basic_properties (LibraryWindow* self, GSi
 	gboolean _tmp12_;
 	GSimpleAction* _tmp13_;
 	GVariant* _tmp14_;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 4879 "LibraryWindow.c"
+#line 4926 "LibraryWindow.c"
 		BasicProperties* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
 		GtkFrame* _tmp6_;
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->bottom_frame;
-#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4898 "LibraryWindow.c"
+#line 4945 "LibraryWindow.c"
 	} else {
 		GtkPaned* _tmp7_;
 		GtkWidget* _tmp8_;
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->sidebar_paned;
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = gtk_paned_get_child2 (_tmp7_);
-#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp8_ != NULL) {
-#line 4908 "LibraryWindow.c"
+#line 4955 "LibraryWindow.c"
 			GtkFrame* _tmp9_;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = self->priv->bottom_frame;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 4914 "LibraryWindow.c"
+#line 4961 "LibraryWindow.c"
 		}
 	}
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = display;
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = action;
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = value;
-#line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp13_, _tmp14_);
-#line 4933 "LibraryWindow.c"
+#line 4980 "LibraryWindow.c"
 }
 
 
 static gboolean _variant_get6 (GVariant* value) {
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_get_boolean (value);
-#line 4940 "LibraryWindow.c"
+#line 4987 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new7 (gboolean value) {
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4947 "LibraryWindow.c"
+#line 4994 "LibraryWindow.c"
 }
 
 
@@ -4956,50 +5003,50 @@ static void library_window_on_action_toggle (LibraryWindow* self, GAction* actio
 	GVariant* _tmp4_;
 	GVariant* _tmp5_;
 	GAction* _tmp6_;
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = action;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _variant_get6 (_tmp2_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _variant_new7 (!_tmp3_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	new_state = _tmp5_;
-#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = action;
-#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp6_, new_state);
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (new_state);
-#line 4986 "LibraryWindow.c"
+#line 5033 "LibraryWindow.c"
 }
 
 
 static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) {
 	GAction* _tmp0_;
 	GVariant* _tmp1_;
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = action;
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = value;
-#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 5003 "LibraryWindow.c"
+#line 5050 "LibraryWindow.c"
 }
 
 
@@ -5010,62 +5057,62 @@ static void library_window_on_display_extended_properties (LibraryWindow* self,
 	gboolean _tmp2_;
 	GSimpleAction* _tmp8_;
 	GVariant* _tmp9_;
-#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 5028 "LibraryWindow.c"
+#line 5075 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
 		ExtendedPropertiesWindow* _tmp6_;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->extended_properties;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp3_, _tmp5_);
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->extended_properties;
-#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 5047 "LibraryWindow.c"
+#line 5094 "LibraryWindow.c"
 	} else {
 		ExtendedPropertiesWindow* _tmp7_;
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->extended_properties;
-#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5054 "LibraryWindow.c"
+#line 5101 "LibraryWindow.c"
 	}
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = action;
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = value;
-#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 5062 "LibraryWindow.c"
+#line 5109 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new8 (gboolean value) {
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5069 "LibraryWindow.c"
+#line 5116 "LibraryWindow.c"
 }
 
 
@@ -5077,35 +5124,35 @@ static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAct
 	ConfigFacade* _tmp3_;
 	GSimpleAction* _tmp4_;
 	GVariant* _tmp5_;
-#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = value;
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_shown = _tmp1_;
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown);
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_search_bar (self, is_shown);
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = action;
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _variant_new8 (is_shown);
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp5_);
-#line 5109 "LibraryWindow.c"
+#line 5156 "LibraryWindow.c"
 }
 
 
@@ -5119,55 +5166,55 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	CheckerboardPage* _tmp6_;
 	CheckerboardPage* _tmp7_;
 	gboolean _tmp8_;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE);
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5137 "LibraryWindow.c"
+#line 5184 "LibraryWindow.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = display;
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = _tmp3_;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_should_show_search_bar (self);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 5153 "LibraryWindow.c"
+#line 5200 "LibraryWindow.c"
 	}
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp4_, _tmp7_);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = display;
-#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp8_) {
-#line 5165 "LibraryWindow.c"
+#line 5212 "LibraryWindow.c"
 		SearchFilterActions* _tmp9_;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->search_actions;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp9_);
-#line 5171 "LibraryWindow.c"
+#line 5218 "LibraryWindow.c"
 	}
 }
 
@@ -5177,23 +5224,23 @@ static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_;
 	GSimpleAction* _tmp2_;
 	GVariant* _tmp3_;
-#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, _tmp1_);
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5197 "LibraryWindow.c"
+#line 5244 "LibraryWindow.c"
 }
 
 
@@ -5203,25 +5250,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp2_;
 	ConfigFacade* _tmp3_;
 	gboolean _tmp4_;
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_paned;
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = visible;
-#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = visible;
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 5225 "LibraryWindow.c"
+#line 5272 "LibraryWindow.c"
 }
 
 
@@ -5231,23 +5278,23 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 720 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5251 "LibraryWindow.c"
+#line 5298 "LibraryWindow.c"
 }
 
 
@@ -5256,23 +5303,23 @@ static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleActio
 	gboolean _tmp1_;
 	GSimpleAction* _tmp2_;
 	GVariant* _tmp3_;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = variant;
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_toolbar_visible (self, _tmp1_);
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = action;
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = variant;
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5276 "LibraryWindow.c"
+#line 5323 "LibraryWindow.c"
 }
 
 
@@ -5289,62 +5336,62 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp10_;
 	ConfigFacade* _tmp11_;
 	gboolean _tmp12_;
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ == NULL;
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5307 "LibraryWindow.c"
+#line 5354 "LibraryWindow.c"
 	}
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_toolbar (_tmp4_);
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 734 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	toolbar = _tmp6_;
-#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = toolbar;
-#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ != NULL) {
-#line 5325 "LibraryWindow.c"
+#line 5372 "LibraryWindow.c"
 		GtkRevealer* _tmp8_;
 		gboolean _tmp9_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->toolbar_revealer;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = visible;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp8_, _tmp9_);
-#line 5334 "LibraryWindow.c"
+#line 5381 "LibraryWindow.c"
 	}
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = visible;
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 5348 "LibraryWindow.c"
+#line 5395 "LibraryWindow.c"
 }
 
 
@@ -5354,48 +5401,48 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5374 "LibraryWindow.c"
+#line 5421 "LibraryWindow.c"
 }
 
 
 static void library_window_show_extended_properties (LibraryWindow* self) {
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
-#line 5383 "LibraryWindow.c"
+#line 5430 "LibraryWindow.c"
 }
 
 
 static void library_window_hide_extended_properties (LibraryWindow* self) {
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
-#line 5392 "LibraryWindow.c"
+#line 5439 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new9 (gboolean value) {
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5399 "LibraryWindow.c"
+#line 5446 "LibraryWindow.c"
 }
 
 
@@ -5408,35 +5455,35 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole
 	ConfigFacade* _tmp4_;
 	ConfigFacade* _tmp5_;
 	gboolean _tmp6_;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
-#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _variant_new9 (_tmp2_);
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (action, _tmp3_);
-#line 755 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp3_);
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = show;
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_);
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 5440 "LibraryWindow.c"
+#line 5487 "LibraryWindow.c"
 }
 
 
@@ -5446,48 +5493,48 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
 	LibraryImportQueueSidebarEntry* _tmp2_;
 	BatchImport* _tmp3_;
 	gboolean _tmp4_;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = batch_import;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = allow_user_cancel;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 5466 "LibraryWindow.c"
+#line 5513 "LibraryWindow.c"
 }
 
 
 static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
 	ImportManifest* _tmp0_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = manifest;
-#line 766 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 5480 "LibraryWindow.c"
+#line 5527 "LibraryWindow.c"
 }
 
 
 static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 5487 "LibraryWindow.c"
+#line 5534 "LibraryWindow.c"
 }
 
 
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library) {
+static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse) {
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
 	GFile* _tmp2_;
@@ -5498,46 +5545,46 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	GeeArrayList* jobs = NULL;
 	GeeArrayList* _tmp15_;
 	GSList* _tmp16_;
-	GeeArrayList* _tmp29_;
-	gint _tmp30_;
+	GeeArrayList* _tmp30_;
 	gint _tmp31_;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gint _tmp32_;
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (job_name != NULL);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_dirs_get_import_dir ();
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_get_home_dir ();
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
-#line 5527 "LibraryWindow.c"
+#line 5574 "LibraryWindow.c"
 		gboolean _tmp7_;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
-#line 5533 "LibraryWindow.c"
+#line 5580 "LibraryWindow.c"
 	} else {
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 5537 "LibraryWindow.c"
+#line 5584 "LibraryWindow.c"
 	}
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 5541 "LibraryWindow.c"
+#line 5588 "LibraryWindow.c"
 		GtkResponseType response = 0;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
@@ -5546,59 +5593,59 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 		GtkResponseType _tmp12_;
 		GtkResponseType _tmp13_;
 		GtkResponseType _tmp14_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_strdup_printf (_ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \
 "s</span>.\n" "Do you want to continue importing photos?"), "▸");
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp9_);
-#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		response = _tmp13_;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = response;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ == GTK_RESPONSE_CANCEL) {
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
-#line 5574 "LibraryWindow.c"
+#line 5621 "LibraryWindow.c"
 		}
-#line 780 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
-#line 5578 "LibraryWindow.c"
+#line 5625 "LibraryWindow.c"
 	}
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp15_;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = uris;
-#line 5586 "LibraryWindow.c"
+#line 5633 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp16_;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 5594 "LibraryWindow.c"
+#line 5641 "LibraryWindow.c"
 			gchar* _tmp17_;
 			gchar* uri = NULL;
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = g_strdup ((const gchar*) uri_it->data);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp17_;
-#line 5601 "LibraryWindow.c"
+#line 5648 "LibraryWindow.c"
 			{
 				GFile* file_or_dir = NULL;
 				const gchar* _tmp18_;
@@ -5610,93 +5657,96 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 				GeeArrayList* _tmp24_;
 				GFile* _tmp25_;
 				gboolean _tmp26_;
-				FileImportJob* _tmp27_;
+				gboolean _tmp27_;
 				FileImportJob* _tmp28_;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				FileImportJob* _tmp29_;
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = uri;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = g_file_new_for_uri (_tmp18_);
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				file_or_dir = _tmp19_;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = file_or_dir;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = g_file_get_path (_tmp20_);
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = _tmp21_;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp23_ = _tmp22_ == NULL;
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (_tmp22_);
-#line 786 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp23_) {
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (file_or_dir);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
-#line 5641 "LibraryWindow.c"
+#line 5689 "LibraryWindow.c"
 				}
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp24_ = jobs;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp25_ = file_or_dir;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp26_ = copy_to_library;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp27_ = file_import_job_new (_tmp25_, _tmp26_);
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp28_ = _tmp27_;
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
-#line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_batch_import_job_unref0 (_tmp28_);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_tmp27_ = recurse;
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_tmp28_ = file_import_job_new (_tmp25_, _tmp26_, _tmp27_);
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_tmp29_ = _tmp28_;
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+				_batch_import_job_unref0 (_tmp29_);
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (file_or_dir);
-#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 5661 "LibraryWindow.c"
+#line 5711 "LibraryWindow.c"
 			}
 		}
 	}
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = jobs;
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = _tmp30_;
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp31_ > 0) {
-#line 5673 "LibraryWindow.c"
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp30_ = jobs;
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp32_ = _tmp31_;
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp32_ > 0) {
+#line 5723 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
-		GeeArrayList* _tmp32_;
-		const gchar* _tmp33_;
-		BatchImport* _tmp34_;
+		GeeArrayList* _tmp33_;
+		const gchar* _tmp34_;
 		BatchImport* _tmp35_;
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp32_ = jobs;
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp33_ = job_name;
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp34_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ITERABLE, GeeIterable), _tmp33_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
-#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		batch_import = _tmp34_;
-#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp35_ = batch_import;
-#line 798 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_enqueue_batch_import (self, _tmp35_, TRUE);
-#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		BatchImport* _tmp36_;
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp33_ = jobs;
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp34_ = job_name;
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp35_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable), _tmp34_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		batch_import = _tmp35_;
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp36_ = batch_import;
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		library_window_enqueue_batch_import (self, _tmp36_, TRUE);
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
-#line 5695 "LibraryWindow.c"
+#line 5745 "LibraryWindow.c"
 	}
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
-#line 5699 "LibraryWindow.c"
+#line 5749 "LibraryWindow.c"
 }
 
 
@@ -5717,157 +5767,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gdk_display_get_default ();
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gdk_display_get_device_manager (_tmp1_);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mask = _tmp4_;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = mask;
-#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0;
-#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = mask;
-#line 810 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt = (_tmp6_ & GDK_MOD1_MASK) != 0;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = mask;
-#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	shift = (_tmp7_ & GDK_SHIFT_MASK) != 0;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = ctrl;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
-#line 5750 "LibraryWindow.c"
+#line 5800 "LibraryWindow.c"
 		gboolean _tmp11_;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
-#line 5756 "LibraryWindow.c"
+#line 5806 "LibraryWindow.c"
 	} else {
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
-#line 5760 "LibraryWindow.c"
+#line 5810 "LibraryWindow.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 5764 "LibraryWindow.c"
+#line 5814 "LibraryWindow.c"
 		gboolean _tmp12_;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
-#line 5770 "LibraryWindow.c"
+#line 5820 "LibraryWindow.c"
 	} else {
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
-#line 5774 "LibraryWindow.c"
+#line 5824 "LibraryWindow.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = GDK_ACTION_COPY;
-#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5782 "LibraryWindow.c"
+#line 5832 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = ctrl;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
-#line 5791 "LibraryWindow.c"
+#line 5841 "LibraryWindow.c"
 			gboolean _tmp16_;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
-#line 5797 "LibraryWindow.c"
+#line 5847 "LibraryWindow.c"
 		} else {
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
-#line 5801 "LibraryWindow.c"
+#line 5851 "LibraryWindow.c"
 		}
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
-#line 5805 "LibraryWindow.c"
+#line 5855 "LibraryWindow.c"
 			gboolean _tmp17_;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
-#line 5811 "LibraryWindow.c"
+#line 5861 "LibraryWindow.c"
 		} else {
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
-#line 5815 "LibraryWindow.c"
+#line 5865 "LibraryWindow.c"
 		}
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp13_) {
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = GDK_ACTION_ASK;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5823 "LibraryWindow.c"
+#line 5873 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = ctrl;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
-#line 5832 "LibraryWindow.c"
+#line 5882 "LibraryWindow.c"
 				gboolean _tmp21_;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
-#line 5838 "LibraryWindow.c"
+#line 5888 "LibraryWindow.c"
 			} else {
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
-#line 5842 "LibraryWindow.c"
+#line 5892 "LibraryWindow.c"
 			}
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
-#line 5846 "LibraryWindow.c"
+#line 5896 "LibraryWindow.c"
 				gboolean _tmp22_;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
-#line 5852 "LibraryWindow.c"
+#line 5902 "LibraryWindow.c"
 			} else {
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
-#line 5856 "LibraryWindow.c"
+#line 5906 "LibraryWindow.c"
 			}
-#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp18_) {
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_LINK;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5864 "LibraryWindow.c"
+#line 5914 "LibraryWindow.c"
 			} else {
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5870 "LibraryWindow.c"
+#line 5920 "LibraryWindow.c"
 			}
 		}
 	}
@@ -5891,87 +5941,87 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	GdkDragContext* _tmp13_;
 	GdkDragAction _tmp14_;
 	guint _tmp15_;
-#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = context;
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_);
-#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	target = _tmp2_;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = target;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = GDK_NONE;
-#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == _tmp4_) {
-#line 5912 "LibraryWindow.c"
+#line 5962 "LibraryWindow.c"
 		GdkDragContext* _tmp5_;
 		guint _tmp6_;
-#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:826: drag target is GDK_NONE");
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:833: drag target is GDK_NONE");
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = context;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = time;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_);
-#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5927 "LibraryWindow.c"
+#line 5977 "LibraryWindow.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gtk_drag_get_source_widget (_tmp7_);
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 5935 "LibraryWindow.c"
+#line 5985 "LibraryWindow.c"
 		GdkDragContext* _tmp9_;
 		guint _tmp10_;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = context;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = time;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_);
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5948 "LibraryWindow.c"
+#line 5998 "LibraryWindow.c"
 	}
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = library_window_get_drag_action (self);
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	drag_action = _tmp11_;
-#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = drag_action;
-#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == GDK_ACTION_DEFAULT) {
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
-#line 5960 "LibraryWindow.c"
+#line 6010 "LibraryWindow.c"
 	}
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = context;
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = drag_action;
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = time;
-#line 845 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_);
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5974 "LibraryWindow.c"
+#line 6024 "LibraryWindow.c"
 }
 
 
@@ -5981,54 +6031,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 	guchar* _tmp1_;
 	GdkDragContext* _tmp2_;
 	GtkWidget* _tmp3_;
-#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selection_data;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_selection_data_get_data (_tmp0_);
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (-1 < 0) {
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:853: failed to retrieve SelectionData");
-#line 5998 "LibraryWindow.c"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:860: failed to retrieve SelectionData");
+#line 6048 "LibraryWindow.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = context;
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gtk_drag_get_source_widget (_tmp2_);
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 6006 "LibraryWindow.c"
+#line 6056 "LibraryWindow.c"
 		GdkDragContext* _tmp4_;
 		GtkSelectionData* _tmp5_;
 		guint _tmp6_;
 		guint _tmp7_;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = context;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = selection_data;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = info;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = time;
-#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 6021 "LibraryWindow.c"
+#line 6071 "LibraryWindow.c"
 	} else {
 		GdkDragContext* _tmp8_;
 		guint _tmp9_;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = context;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = time;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 6031 "LibraryWindow.c"
+#line 6081 "LibraryWindow.c"
 	}
 }
 
@@ -6051,198 +6101,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	GdkDragAction _tmp22_;
 	GdkDragContext* _tmp23_;
 	guint _tmp24_;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry));
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (data != NULL);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = _tmp2_;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array_length1 = _vala_array_length (_tmp1_);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_uris_array_size_ = uris_array_length1;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris = NULL;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = uris_array;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3__length1 = uris_array_length1;
-#line 6078 "LibraryWindow.c"
+#line 6128 "LibraryWindow.c"
 	{
 		gchar** uri_collection = NULL;
 		gint uri_collection_length1 = 0;
 		gint _uri_collection_size_ = 0;
 		gint uri_it = 0;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp3_;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection_length1 = _tmp3__length1;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 6090 "LibraryWindow.c"
+#line 6140 "LibraryWindow.c"
 			gchar* _tmp4_;
 			gchar* uri = NULL;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = g_strdup (uri_collection[uri_it]);
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp4_;
-#line 6097 "LibraryWindow.c"
+#line 6147 "LibraryWindow.c"
 			{
 				const gchar* _tmp5_;
 				gchar* _tmp6_;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp5_ = uri;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp6_ = g_strdup (_tmp5_);
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris = g_slist_append (uris, _tmp6_);
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 6109 "LibraryWindow.c"
+#line 6159 "LibraryWindow.c"
 			}
 		}
 	}
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gdk_drag_context_get_selected_action (_tmp7_);
-#line 871 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	selected_action = _tmp8_;
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = selected_action;
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == GDK_ACTION_ASK) {
-#line 6123 "LibraryWindow.c"
+#line 6173 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
 		GSList* _tmp10_;
 		GtkResponseType _tmp18_;
-#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_result_ = GTK_RESPONSE_REJECT;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uris;
-#line 6131 "LibraryWindow.c"
+#line 6181 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri_collection = _tmp10_;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6139 "LibraryWindow.c"
+#line 6189 "LibraryWindow.c"
 				gchar* _tmp11_;
 				gchar* uri = NULL;
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = g_strdup ((const gchar*) uri_it->data);
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uri = _tmp11_;
-#line 6146 "LibraryWindow.c"
+#line 6196 "LibraryWindow.c"
 				{
 					const gchar* _tmp12_;
 					GFile* _tmp13_;
 					GFile* _tmp14_;
 					gboolean _tmp15_;
 					gboolean _tmp16_;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp12_ = uri;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp13_ = g_file_new_for_uri (_tmp12_);
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp14_ = _tmp13_;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp16_ = !_tmp15_;
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (_tmp14_);
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					if (_tmp16_) {
-#line 6167 "LibraryWindow.c"
+#line 6217 "LibraryWindow.c"
 						GtkResponseType _tmp17_;
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_tmp17_ = copy_files_dialog ();
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_result_ = _tmp17_;
-#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_g_free0 (uri);
-#line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
-#line 6177 "LibraryWindow.c"
+#line 6227 "LibraryWindow.c"
 					}
-#line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 6181 "LibraryWindow.c"
+#line 6231 "LibraryWindow.c"
 				}
 			}
 		}
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _result_;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		switch (_tmp18_) {
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
-#line 6191 "LibraryWindow.c"
+#line 6241 "LibraryWindow.c"
 			{
-#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_COPY;
-#line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6197 "LibraryWindow.c"
+#line 6247 "LibraryWindow.c"
 			}
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
-#line 6201 "LibraryWindow.c"
+#line 6251 "LibraryWindow.c"
 			{
-#line 889 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_LINK;
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6207 "LibraryWindow.c"
+#line 6257 "LibraryWindow.c"
 			}
 			default:
 			{
 				GdkDragContext* _tmp19_;
 				guint _tmp20_;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = context;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = time;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_);
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				__g_slist_free__g_free0_0 (uris);
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
-#line 6225 "LibraryWindow.c"
+#line 6275 "LibraryWindow.c"
 			}
 		}
 	}
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = uris;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selected_action;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY);
-#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY, TRUE);
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = context;
-#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = time;
-#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_);
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	__g_slist_free__g_free0_0 (uris);
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 6245 "LibraryWindow.c"
+#line 6295 "LibraryWindow.c"
 }
 
 
@@ -6252,23 +6302,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
 	LibraryPhotosEntry* _tmp2_;
 	Page* _tmp3_;
 	Page* _tmp4_;
-#line 905 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_photos_entry (_tmp0_);
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6271 "LibraryWindow.c"
+#line 6321 "LibraryWindow.c"
 }
 
 
@@ -6278,41 +6328,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 	Event* _tmp1_;
 	EventsEventEntry* _tmp2_;
 	EventsEventEntry* _tmp3_;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 910 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 911 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6297 "LibraryWindow.c"
+#line 6347 "LibraryWindow.c"
 		EventsEventEntry* _tmp4_;
 		Page* _tmp5_;
 		Page* _tmp6_;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6311 "LibraryWindow.c"
+#line 6361 "LibraryWindow.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6315 "LibraryWindow.c"
+#line 6365 "LibraryWindow.c"
 }
 
 
@@ -6322,41 +6372,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
 	TagsSidebarEntry* _tmp3_;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_TAG (tag));
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6341 "LibraryWindow.c"
+#line 6391 "LibraryWindow.c"
 		TagsSidebarEntry* _tmp4_;
 		Page* _tmp5_;
 		Page* _tmp6_;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6355 "LibraryWindow.c"
+#line 6405 "LibraryWindow.c"
 	}
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6359 "LibraryWindow.c"
+#line 6409 "LibraryWindow.c"
 }
 
 
@@ -6366,41 +6416,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 	SavedSearch* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
 	SearchesSidebarEntry* _tmp3_;
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6385 "LibraryWindow.c"
+#line 6435 "LibraryWindow.c"
 		SearchesSidebarEntry* _tmp4_;
 		Page* _tmp5_;
 		Page* _tmp6_;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 6399 "LibraryWindow.c"
+#line 6449 "LibraryWindow.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6403 "LibraryWindow.c"
+#line 6453 "LibraryWindow.c"
 }
 
 
@@ -6416,66 +6466,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 	CollectionPage* _tmp10_;
 	Photo* _tmp11_;
 	LibraryPhotoPage* _tmp12_;
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (controller));
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PHOTO (current));
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = controller;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = current;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource));
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null");
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->photo_page;
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 6447 "LibraryWindow.c"
+#line 6497 "LibraryWindow.c"
 		LibraryPhotoPage* _tmp7_;
 		LibraryPhotoPage* _tmp8_;
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_photo_page_new ();
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_object_ref_sink (_tmp7_);
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (self->priv->photo_page);
-#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->photo_page = _tmp7_;
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->photo_page;
-#line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
-#line 6464 "LibraryWindow.c"
+#line 6514 "LibraryWindow.c"
 	}
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->photo_page;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = controller;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = current;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL);
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->photo_page;
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 6478 "LibraryWindow.c"
+#line 6528 "LibraryWindow.c"
 }
 
 
@@ -6485,23 +6535,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
 	LibraryImportQueueSidebarEntry* _tmp2_;
 	Page* _tmp3_;
 	Page* _tmp4_;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6504 "LibraryWindow.c"
+#line 6554 "LibraryWindow.c"
 }
 
 
@@ -6522,169 +6572,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	gboolean _tmp13_ = FALSE;
 	GMount* _tmp14_;
 	GError * _inner_error_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->camera_branch;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = camera;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_);
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6545 "LibraryWindow.c"
+#line 6595 "LibraryWindow.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = entry;
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 951 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage);
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = camera;
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_->uri;
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp8_;
-#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 962 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 6563 "LibraryWindow.c"
+#line 6613 "LibraryWindow.c"
 	{
 		GMount* _tmp9_ = NULL;
 		GFile* _tmp10_;
 		GMount* _tmp11_;
 		GMount* _tmp12_;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uri_file;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp11_;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6577 "LibraryWindow.c"
-			goto __catch42_g_error;
+#line 6627 "LibraryWindow.c"
+			goto __catch46_g_error;
 		}
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp12_;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp9_);
-#line 6590 "LibraryWindow.c"
+#line 6640 "LibraryWindow.c"
 	}
-	goto __finally42;
-	__catch42_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* err = NULL;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 6602 "LibraryWindow.c"
+#line 6652 "LibraryWindow.c"
 	}
-	__finally42:
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally46:
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (page);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.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 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6621 "LibraryWindow.c"
+#line 6671 "LibraryWindow.c"
 	}
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = mount;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp14_ != NULL) {
-#line 6627 "LibraryWindow.c"
+#line 6677 "LibraryWindow.c"
 		DiscoveredCamera* _tmp15_;
 		const gchar* _tmp16_;
 		gboolean _tmp17_;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = camera;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_->uri;
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = g_str_has_prefix (_tmp16_, "file://");
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = !_tmp17_;
-#line 6639 "LibraryWindow.c"
+#line 6689 "LibraryWindow.c"
 	} else {
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = FALSE;
-#line 6643 "LibraryWindow.c"
+#line 6693 "LibraryWindow.c"
 	}
-#line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 6647 "LibraryWindow.c"
+#line 6697 "LibraryWindow.c"
 		ImportPage* _tmp18_;
 		GMount* _tmp19_;
 		gboolean _tmp20_;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = page;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = mount;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp20_) {
-#line 6659 "LibraryWindow.c"
+#line 6709 "LibraryWindow.c"
 			ImportPage* _tmp21_;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = page;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 6665 "LibraryWindow.c"
+#line 6715 "LibraryWindow.c"
 		} else {
-#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 6669 "LibraryWindow.c"
+#line 6719 "LibraryWindow.c"
 		}
 	} else {
 		ImportPage* _tmp22_;
-#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = page;
-#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 6677 "LibraryWindow.c"
+#line 6727 "LibraryWindow.c"
 	}
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page);
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6687 "LibraryWindow.c"
+#line 6737 "LibraryWindow.c"
 }
 
 
@@ -6693,25 +6743,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp1_;
 	Page* _tmp2_;
 	GtkStack* _tmp3_;
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->stack;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->stack;
-#line 980 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 6714 "LibraryWindow.c"
+#line 6764 "LibraryWindow.c"
 }
 
 
@@ -6719,49 +6769,49 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp0_;
 	Page* _tmp1_;
 	GtkStack* _tmp2_;
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->stack;
-#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 6736 "LibraryWindow.c"
+#line 6786 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new10 (gboolean value) {
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6743 "LibraryWindow.c"
+#line 6793 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new11 (gboolean value) {
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6750 "LibraryWindow.c"
+#line 6800 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new12 (gboolean value) {
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6757 "LibraryWindow.c"
+#line 6807 "LibraryWindow.c"
 }
 
 
 static GVariant* _variant_new13 (const gchar* value) {
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6764 "LibraryWindow.c"
+#line 6814 "LibraryWindow.c"
 }
 
 
@@ -6806,148 +6856,148 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	gchar* _tmp32_;
 	GAction* _tmp33_;
 	GVariant* _tmp34_;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayBasicProperties");
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_display_action = _tmp1_;
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = basic_display_action;
-#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp2_ != NULL, "basic_display_action != null");
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = basic_display_action;
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _variant_new10 (_tmp6_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp3_, _tmp7_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	extended_display_action = _tmp9_;
-#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = extended_display_action;
-#line 997 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp10_ != NULL, "extended_display_action != null");
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = extended_display_action;
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_;
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = _variant_new11 (_tmp14_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp11_, _tmp15_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp15_);
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp13_);
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = _g_object_ref0 (_tmp16_);
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_bar_display_action = _tmp17_;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = search_bar_display_action;
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp18_ != NULL, "search_bar_display_action != null");
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = search_bar_display_action;
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = config_facade_get_instance ();
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = _tmp20_;
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = _variant_new12 (_tmp22_);
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp19_, _tmp23_);
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp23_);
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp21_);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sort_events_action = _tmp25_;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = sort_events_action;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp26_ != NULL, "sort_events_action != null");
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = config_facade_get_instance ();
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = _tmp30_;
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp31_) {
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 6913 "LibraryWindow.c"
+#line 6963 "LibraryWindow.c"
 	} else {
-#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6917 "LibraryWindow.c"
+#line 6967 "LibraryWindow.c"
 	}
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = g_strdup (_tmp27_);
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	event_sort_val = _tmp32_;
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = sort_events_action;
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _variant_new13 (event_sort_val);
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_action_change_state (_tmp33_, _tmp34_);
-#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp34_);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (event_sort_val);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sort_events_action);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (search_bar_display_action);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (extended_display_action);
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
-#line 6941 "LibraryWindow.c"
+#line 6991 "LibraryWindow.c"
 }
 
 
 static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) {
 	gboolean result;
 	result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self);
-#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6950 "LibraryWindow.c"
+#line 7000 "LibraryWindow.c"
 }
 
 
@@ -6960,62 +7010,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s
 	const gchar* _tmp5_;
 	GtkProgressBar* _tmp6_;
 	guint _tmp7_;
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6975 "LibraryWindow.c"
+#line 7025 "LibraryWindow.c"
 	}
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = priority;
-#line 1022 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp3_;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = label;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
-#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->background_progress_bar;
-#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp6_);
-#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref);
-#line 1028 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = _tmp7_;
-#line 7001 "LibraryWindow.c"
+#line 7051 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
 	gboolean result = FALSE;
 	GtkProgressBar* _tmp0_;
-#line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_bar;
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp0_);
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7018 "LibraryWindow.c"
+#line 7068 "LibraryWindow.c"
 }
 
 
@@ -7024,43 +7074,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se
 	gint _tmp1_;
 	guint _tmp2_;
 	gboolean _tmp4_;
-#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7037 "LibraryWindow.c"
+#line 7087 "LibraryWindow.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_pulse_id;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 7043 "LibraryWindow.c"
+#line 7093 "LibraryWindow.c"
 		guint _tmp3_;
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_pulse_id;
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_source_remove (_tmp3_);
-#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
-#line 7051 "LibraryWindow.c"
+#line 7101 "LibraryWindow.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = clear;
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 7057 "LibraryWindow.c"
+#line 7107 "LibraryWindow.c"
 		gint _tmp5_;
-#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = priority;
-#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp5_);
-#line 7063 "LibraryWindow.c"
+#line 7113 "LibraryWindow.c"
 	}
 }
 
@@ -7083,100 +7133,100 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 	gdouble _tmp17_;
 	gchar* _tmp18_;
 	gchar* _tmp19_;
-#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7098 "LibraryWindow.c"
+#line 7148 "LibraryWindow.c"
 	}
-#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1056 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = count;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ <= 0.0) {
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = TRUE;
-#line 7110 "LibraryWindow.c"
+#line 7160 "LibraryWindow.c"
 	} else {
 		gdouble _tmp6_;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = total;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp6_ <= 0.0;
-#line 7117 "LibraryWindow.c"
+#line 7167 "LibraryWindow.c"
 	}
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = TRUE;
-#line 7123 "LibraryWindow.c"
+#line 7173 "LibraryWindow.c"
 	} else {
 		gdouble _tmp7_;
 		gdouble _tmp8_;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = count;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = total;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp7_ >= _tmp8_;
-#line 7133 "LibraryWindow.c"
+#line 7183 "LibraryWindow.c"
 	}
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 7137 "LibraryWindow.c"
+#line 7187 "LibraryWindow.c"
 		gint _tmp9_;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = priority;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp9_);
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7145 "LibraryWindow.c"
+#line 7195 "LibraryWindow.c"
 	}
-#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = priority;
-#line 1064 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp10_;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = count;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = total;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fraction = _tmp11_ / _tmp12_;
-#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->background_progress_bar;
-#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = fraction;
-#line 1067 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp13_, _tmp14_);
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->background_progress_bar;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = label;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = fraction;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = g_strdup_printf (_ ("%s (%d%%)"), _tmp16_, (gint) (_tmp17_ * 100.0));
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = _tmp18_;
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp15_, _tmp19_);
-#line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp19_);
-#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 7179 "LibraryWindow.c"
+#line 7229 "LibraryWindow.c"
 }
 
 
@@ -7186,179 +7236,179 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g
 	gint _tmp2_;
 	GtkProgressBar* _tmp3_;
 	GtkProgressBar* _tmp4_;
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1085 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7199 "LibraryWindow.c"
+#line 7249 "LibraryWindow.c"
 	}
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1084 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_bar;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, 0.0);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, "");
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
-#line 7217 "LibraryWindow.c"
+#line 7267 "LibraryWindow.c"
 }
 
 
 static void library_window_show_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 7229 "LibraryWindow.c"
+#line 7279 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
 		GtkFrame* _tmp3_;
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_frame;
-#line 1099 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
-#line 7245 "LibraryWindow.c"
+#line 7295 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_;
-#line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 7258 "LibraryWindow.c"
+#line 7308 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
-#line 7269 "LibraryWindow.c"
+#line 7319 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
-#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 7279 "LibraryWindow.c"
+#line 7329 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) {
-#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 7288 "LibraryWindow.c"
+#line 7338 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
 	gint _tmp0_;
-#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total_files;
-#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
-#line 1121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 7302 "LibraryWindow.c"
+#line 7352 "LibraryWindow.c"
 	} else {
 		gint _tmp1_;
 		gint _tmp2_;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = completed_files;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = total_files;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7312 "LibraryWindow.c"
+#line 7362 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 7322 "LibraryWindow.c"
+#line 7372 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes) {
 	guint64 _tmp0_;
 	guint64 _tmp1_;
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = completed_bytes;
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = total_bytes;
-#line 1134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 7337 "LibraryWindow.c"
+#line 7387 "LibraryWindow.c"
 }
 
 
 static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
 	guint _tmp0_;
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total;
-#line 1139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
-#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 7351 "LibraryWindow.c"
+#line 7401 "LibraryWindow.c"
 	} else {
 		guint _tmp1_;
 		guint _tmp2_;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = completed;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = total;
-#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7361 "LibraryWindow.c"
+#line 7411 "LibraryWindow.c"
 	}
 }
 
@@ -7415,220 +7465,220 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 	GtkBox* _tmp47_;
 	Page* _tmp48_;
 	Page* _tmp49_;
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (start_page));
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	scrolled_sidebar = _tmp0_;
-#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_frame;
-#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2);
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_frame;
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->background_progress_frame;
-#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp6_, "frame");
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->basic_properties;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->basic_properties;
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->basic_properties;
-#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->basic_properties;
-#line 1162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->basic_properties;
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10);
-#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->basic_properties;
-#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10);
-#line 1165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->basic_properties;
-#line 1165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6);
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->basic_properties;
-#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), 0);
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->bottom_frame;
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->basic_properties;
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = self->priv->bottom_frame;
-#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 1169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp18_, "frame");
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->top_section;
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = self->priv->sidebar_paned;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->top_section;
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = self->priv->sidebar_paned;
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->bottom_frame;
-#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = self->priv->sidebar_paned;
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp24_, 1000);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->right_vbox = _tmp25_;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = self->priv->right_vbox;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp27_ = self->priv->search_toolbar;
-#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = self->priv->right_vbox;
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = self->priv->stack;
-#line 1181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->right_vbox;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = self->priv->toolbar_revealer;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp32_);
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->client_paned);
-#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->client_paned = _tmp32_;
-#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = self->priv->client_paned;
-#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = self->priv->sidebar_paned;
-#line 1185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack1 (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = self->priv->sidebar_tree;
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp36_ = self->priv->client_paned;
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = self->priv->right_vbox;
-#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_pack2 (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = self->priv->client_paned;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = config_facade_get_instance ();
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = _tmp39_;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_paned_set_position (_tmp38_, _tmp41_);
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp40_);
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = self->priv->stack;
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = library_window_get_PAGE_MIN_WIDTH ();
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp44_, -1);
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = self->priv->layout;
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = self->priv->client_paned;
-#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_box_pack_end (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp47_ = self->priv->layout;
-#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
-#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = start_page;
-#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp48_);
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = start_page;
-#line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
-#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
-#line 7604 "LibraryWindow.c"
+#line 7654 "LibraryWindow.c"
 }
 
 
 static void library_window_real_set_current_page (PageWindow* base, Page* page) {
 	LibraryWindow * self;
 	Page* _tmp0_;
-#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp0_);
-#line 7619 "LibraryWindow.c"
+#line 7669 "LibraryWindow.c"
 }
 
 
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
 	gboolean _tmp0_;
-#line 1205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = should_enable;
-#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = _tmp0_;
-#line 7631 "LibraryWindow.c"
+#line 7681 "LibraryWindow.c"
 }
 
 
@@ -7673,43 +7723,43 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	GtkToolbar* _tmp54_;
 	GtkToolbar* _tmp55_;
 	Page* _tmp61_;
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_switching_enabled;
-#line 1210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7686 "LibraryWindow.c"
+#line 7736 "LibraryWindow.c"
 	}
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp1_ == _tmp3_;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7702 "LibraryWindow.c"
+#line 7752 "LibraryWindow.c"
 	}
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp5_;
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = current_page;
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 7712 "LibraryWindow.c"
+#line 7762 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
 		Page* _tmp7_;
 		GtkToolbar* _tmp8_;
@@ -7717,96 +7767,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		Page* _tmp12_;
 		Page* _tmp13_;
 		Page* _tmp15_;
-#line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
-#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		application_set_menubar (NULL);
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = current_page;
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_toolbar (_tmp7_);
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		toolbar = _tmp8_;
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = toolbar;
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp9_ != NULL) {
-#line 7734 "LibraryWindow.c"
+#line 7784 "LibraryWindow.c"
 			GtkRevealer* _tmp10_;
 			GtkToolbar* _tmp11_;
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = self->priv->toolbar_revealer;
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp11_ = toolbar;
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 7743 "LibraryWindow.c"
+#line 7793 "LibraryWindow.c"
 		}
-#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = current_page;
-#line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		page_switching_from (_tmp12_);
-#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = current_page;
-#line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7753 "LibraryWindow.c"
+#line 7803 "LibraryWindow.c"
 			SidebarTree* _tmp14_;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = self->priv->sidebar_tree;
-#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_enable_editing (_tmp14_);
-#line 7759 "LibraryWindow.c"
+#line 7809 "LibraryWindow.c"
 		}
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = current_page;
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_unsubscribe_from_basic_information (self, _tmp15_);
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
-#line 7767 "LibraryWindow.c"
+#line 7817 "LibraryWindow.c"
 	}
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->stack;
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = page;
-#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = page;
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_);
-#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = page;
-#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7783 "LibraryWindow.c"
+#line 7833 "LibraryWindow.c"
 		SidebarTree* _tmp20_;
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = self->priv->sidebar_tree;
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_disable_editing (_tmp20_);
-#line 7789 "LibraryWindow.c"
+#line 7839 "LibraryWindow.c"
 	}
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = library_window_should_show_search_bar (self);
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = page;
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL);
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->page_map;
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = page;
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_);
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = (SidebarEntry*) _tmp25_;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = entry;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp26_ != NULL) {
-#line 7809 "LibraryWindow.c"
+#line 7859 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
 		SidebarEntry* _tmp27_;
 		SidebarExpandableEntry* _tmp28_;
@@ -7814,161 +7864,161 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		SidebarExpandableEntry* _tmp30_;
 		SidebarTree* _tmp35_;
 		SidebarEntry* _tmp36_;
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = entry;
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL);
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		expandable_entry = _tmp28_;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = expandable_entry;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp30_ != NULL) {
-#line 7827 "LibraryWindow.c"
+#line 7877 "LibraryWindow.c"
 			SidebarExpandableEntry* _tmp31_;
 			gboolean _tmp32_;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp31_ = expandable_entry;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = _tmp32_;
-#line 7836 "LibraryWindow.c"
+#line 7886 "LibraryWindow.c"
 		} else {
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = FALSE;
-#line 7840 "LibraryWindow.c"
+#line 7890 "LibraryWindow.c"
 		}
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp29_) {
-#line 7844 "LibraryWindow.c"
+#line 7894 "LibraryWindow.c"
 			SidebarTree* _tmp33_;
 			SidebarEntry* _tmp34_;
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp33_ = self->priv->sidebar_tree;
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = entry;
-#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 7853 "LibraryWindow.c"
+#line 7903 "LibraryWindow.c"
 		}
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = self->priv->sidebar_tree;
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = entry;
-#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
-#line 7863 "LibraryWindow.c"
+#line 7913 "LibraryWindow.c"
 	}
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = page;
-#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 7871 "LibraryWindow.c"
+#line 7921 "LibraryWindow.c"
 		Page* _tmp38_;
-#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = page;
-#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 7877 "LibraryWindow.c"
+#line 7927 "LibraryWindow.c"
 	}
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = page;
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_subscribe_for_basic_information (self, _tmp41_);
-#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = page;
-#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_switched_to (_tmp42_);
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = page;
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = page_get_menubar (_tmp43_);
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp45_ = _tmp44_;
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	application_set_menubar (_tmp45_);
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp45_);
-#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
-#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp46_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_get (_tmp46_, "gtk-shell-shows-menubar", &_tmp47_, NULL);
-#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp48_ = _tmp47_;
-#line 1278 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	old = _tmp48_;
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp49_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp50_ = old;
-#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_set (_tmp49_, "gtk-shell-shows-menubar", !_tmp50_, NULL);
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp51_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp52_ = old;
-#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_set (_tmp51_, "gtk-shell-shows-menubar", _tmp52_, NULL);
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp53_ = page;
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp54_ = page_get_toolbar (_tmp53_);
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	toolbar = _tmp54_;
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp55_ = toolbar;
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp55_ != NULL) {
-#line 7937 "LibraryWindow.c"
+#line 7987 "LibraryWindow.c"
 		GtkRevealer* _tmp56_;
 		GtkToolbar* _tmp57_;
 		GtkToolbar* _tmp58_;
 		GtkRevealer* _tmp59_;
 		gboolean _tmp60_;
-#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp56_ = self->priv->toolbar_revealer;
-#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp57_ = toolbar;
-#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp58_ = toolbar;
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp59_ = self->priv->toolbar_revealer;
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp60_ = library_window_is_toolbar_visible (self);
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_revealer_set_reveal_child (_tmp59_, _tmp60_);
-#line 7959 "LibraryWindow.c"
+#line 8009 "LibraryWindow.c"
 	}
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp61_ = page;
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_ready (_tmp61_);
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 7971 "LibraryWindow.c"
+#line 8021 "LibraryWindow.c"
 }
 
 
@@ -7983,41 +8033,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 	CheckerboardPage* _tmp7_;
 	SearchViewFilter* _tmp8_;
 	SearchViewFilter* _tmp9_;
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (page));
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_);
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_);
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp3_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = page;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp9_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 8020 "LibraryWindow.c"
+#line 8070 "LibraryWindow.c"
 }
 
 
@@ -8027,35 +8077,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	Page* _tmp1_;
 	Page* _tmp2_;
 	gboolean _tmp3_;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8042 "LibraryWindow.c"
+#line 8092 "LibraryWindow.c"
 		gboolean _tmp4_;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 8048 "LibraryWindow.c"
+#line 8098 "LibraryWindow.c"
 	} else {
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 8052 "LibraryWindow.c"
+#line 8102 "LibraryWindow.c"
 	}
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 1298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8058 "LibraryWindow.c"
+#line 8108 "LibraryWindow.c"
 }
 
 
@@ -8063,21 +8113,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 	SearchFilterToolbar* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page));
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = show;
-#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_);
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8080 "LibraryWindow.c"
+#line 8130 "LibraryWindow.c"
 		CheckerboardPage* _tmp3_;
 		SearchFilterToolbar* _tmp4_;
 		CheckerboardPage* _tmp5_;
@@ -8089,70 +8139,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 		CheckerboardPage* _tmp11_;
 		SearchViewFilter* _tmp12_;
 		SearchViewFilter* _tmp13_;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page;
-#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_assert (NULL != _tmp3_, "null != page");
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->search_toolbar;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = page;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_);
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_);
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp7_);
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = page;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_);
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp13_);
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 8126 "LibraryWindow.c"
+#line 8176 "LibraryWindow.c"
 	} else {
 		CheckerboardPage* _tmp14_;
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = page;
-#line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ != NULL) {
-#line 8133 "LibraryWindow.c"
+#line 8183 "LibraryWindow.c"
 			CheckerboardPage* _tmp15_;
 			ViewCollection* _tmp16_;
 			ViewCollection* _tmp17_;
 			DisabledViewFilter* _tmp18_;
 			DisabledViewFilter* _tmp19_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp15_ = page;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page));
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = _tmp16_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp18_ = disabled_view_filter_new ();
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp19_ = _tmp18_;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_view_filter_unref0 (_tmp19_);
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_tmp17_);
-#line 8155 "LibraryWindow.c"
+#line 8205 "LibraryWindow.c"
 		}
 	}
 }
@@ -8166,33 +8216,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
 	Page* _tmp4_;
 	SidebarPageRepresentative* _tmp5_;
 	Page* _tmp6_;
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_map;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (!_tmp2_, "!page_map.has_key(page)");
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->page_map;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = entry;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_add_to_stack (self, _tmp6_);
-#line 8195 "LibraryWindow.c"
+#line 8245 "LibraryWindow.c"
 }
 
 
@@ -8206,61 +8256,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 	GeeHashMap* _tmp10_;
 	Page* _tmp11_;
 	gboolean _tmp12_;
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp0_ == _tmp2_;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8227 "LibraryWindow.c"
+#line 8277 "LibraryWindow.c"
 		LibraryBranch* _tmp4_;
 		LibraryPhotosEntry* _tmp5_;
 		LibraryPhotosEntry* _tmp6_;
 		Page* _tmp7_;
 		Page* _tmp8_;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->library_branch;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = library_branch_get_photos_entry (_tmp4_);
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp8_);
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8247 "LibraryWindow.c"
+#line 8297 "LibraryWindow.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = page;
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_remove_from_stack (self, _tmp9_);
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->page_map;
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = page;
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	removed = _tmp12_;
-#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
-#line 8263 "LibraryWindow.c"
+#line 8313 "LibraryWindow.c"
 }
 
 
@@ -8269,39 +8319,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb
 	SidebarSelectableEntry* _tmp0_;
 	SidebarPageRepresentative* _tmp1_;
 	SidebarPageRepresentative* _tmp2_;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selectable;
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL);
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_rep = _tmp1_;
-#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_rep;
-#line 1334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 8286 "LibraryWindow.c"
+#line 8336 "LibraryWindow.c"
 		SidebarPageRepresentative* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page_rep;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (_tmp3_);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8300 "LibraryWindow.c"
+#line 8350 "LibraryWindow.c"
 	}
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
-#line 8304 "LibraryWindow.c"
+#line 8354 "LibraryWindow.c"
 }
 
 
@@ -8322,207 +8372,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 	LibraryPhotosEntry* _tmp32_;
 	Page* _tmp33_;
 	Page* _tmp34_;
-#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_last_imported_entry (_tmp0_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	last_import_entry = _tmp3_;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = selectable;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 8343 "LibraryWindow.c"
+#line 8393 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp6_;
 		gboolean _tmp7_;
 		gboolean _tmp8_;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = last_import_entry;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry));
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp8_;
-#line 8355 "LibraryWindow.c"
+#line 8405 "LibraryWindow.c"
 	} else {
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
-#line 8359 "LibraryWindow.c"
+#line 8409 "LibraryWindow.c"
 	}
-#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8363 "LibraryWindow.c"
+#line 8413 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp9_;
 		Page* _tmp10_;
 		Page* _tmp11_;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = last_import_entry;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp11_);
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8381 "LibraryWindow.c"
+#line 8431 "LibraryWindow.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = selectable;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 8387 "LibraryWindow.c"
+#line 8437 "LibraryWindow.c"
 		EventsBranch* _tmp14_;
 		gboolean _tmp15_;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = self->priv->events_branch;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp15_;
-#line 8396 "LibraryWindow.c"
+#line 8446 "LibraryWindow.c"
 	} else {
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = FALSE;
-#line 8400 "LibraryWindow.c"
+#line 8450 "LibraryWindow.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 8404 "LibraryWindow.c"
+#line 8454 "LibraryWindow.c"
 		EventsBranch* _tmp16_;
 		EventsMasterDirectoryEntry* _tmp17_;
 		EventsMasterDirectoryEntry* _tmp18_;
 		Page* _tmp19_;
 		Page* _tmp20_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = self->priv->events_branch;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = events_branch_get_master_entry (_tmp16_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp20_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8430 "LibraryWindow.c"
+#line 8480 "LibraryWindow.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selectable;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 8436 "LibraryWindow.c"
+#line 8486 "LibraryWindow.c"
 		EventsBranch* _tmp23_;
 		gboolean _tmp24_;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = self->priv->events_branch;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = _tmp24_;
-#line 8445 "LibraryWindow.c"
+#line 8495 "LibraryWindow.c"
 	} else {
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = FALSE;
-#line 8449 "LibraryWindow.c"
+#line 8499 "LibraryWindow.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp21_) {
-#line 8453 "LibraryWindow.c"
+#line 8503 "LibraryWindow.c"
 		EventsBranch* _tmp25_;
 		EventsMasterDirectoryEntry* _tmp26_;
 		EventsMasterDirectoryEntry* _tmp27_;
 		Page* _tmp28_;
 		Page* _tmp29_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = self->priv->events_branch;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = events_branch_get_master_entry (_tmp25_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = _tmp26_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp29_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp29_);
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp27_);
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8479 "LibraryWindow.c"
+#line 8529 "LibraryWindow.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->library_branch;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_branch_get_photos_entry (_tmp30_);
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp34_);
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
-#line 8497 "LibraryWindow.c"
+#line 8547 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8504 "LibraryWindow.c"
+#line 8554 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8511 "LibraryWindow.c"
+#line 8561 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8518 "LibraryWindow.c"
+#line 8568 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8525 "LibraryWindow.c"
+#line 8575 "LibraryWindow.c"
 }
 
 
@@ -8530,27 +8580,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
 	ViewCollection* view = NULL;
 	Page* _tmp0_;
 	ViewCollection* _tmp1_;
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0);
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0);
-#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0);
-#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0);
-#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8553 "LibraryWindow.c"
+#line 8603 "LibraryWindow.c"
 }
 
 
@@ -8562,47 +8612,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se
 	guint _tmp3_;
 	guint _tmp4_;
 	guint _tmp5_;
-#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self);
-#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
-#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8593 "LibraryWindow.c"
+#line 8643 "LibraryWindow.c"
 }
 
 
 static void library_window_on_update_properties (LibraryWindow* self) {
 	OneShotScheduler* _tmp0_;
-#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->properties_scheduler;
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
-#line 8605 "LibraryWindow.c"
+#line 8655 "LibraryWindow.c"
 }
 
 
@@ -8613,55 +8663,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	ExtendedPropertiesWindow* _tmp6_;
 	gboolean _tmp7_;
 	gboolean _tmp8_;
-#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->bottom_frame;
-#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8626 "LibraryWindow.c"
+#line 8676 "LibraryWindow.c"
 		BasicProperties* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8640 "LibraryWindow.c"
+#line 8690 "LibraryWindow.c"
 	}
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 8650 "LibraryWindow.c"
+#line 8700 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp9_;
 		Page* _tmp10_;
 		Page* _tmp11_;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->extended_properties;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 8664 "LibraryWindow.c"
+#line 8714 "LibraryWindow.c"
 	}
 }
 
@@ -8681,20 +8731,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	if ((*((gchar*) self)) == '\0') {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 8684 "LibraryWindow.c"
+#line 8734 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp2_;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = old;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 8691 "LibraryWindow.c"
+#line 8741 "LibraryWindow.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 8697 "LibraryWindow.c"
+#line 8747 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp3_;
 		const gchar* _tmp4_;
@@ -8704,11 +8754,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_tmp4_ = replacement;
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 8707 "LibraryWindow.c"
+#line 8757 "LibraryWindow.c"
 	}
 #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8711 "LibraryWindow.c"
+#line 8761 "LibraryWindow.c"
 		gchar* _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = g_strdup (self);
@@ -8716,7 +8766,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		result = _tmp5_;
 #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8719 "LibraryWindow.c"
+#line 8769 "LibraryWindow.c"
 	}
 	{
 		GRegex* regex = NULL;
@@ -8748,8 +8798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8751 "LibraryWindow.c"
-				goto __catch44_g_regex_error;
+#line 8801 "LibraryWindow.c"
+				goto __catch48_g_regex_error;
 			}
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			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);
@@ -8757,7 +8807,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8760 "LibraryWindow.c"
+#line 8810 "LibraryWindow.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = regex;
@@ -8773,8 +8823,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8776 "LibraryWindow.c"
-				goto __catch44_g_regex_error;
+#line 8826 "LibraryWindow.c"
+				goto __catch48_g_regex_error;
 			}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -8784,7 +8834,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8787 "LibraryWindow.c"
+#line 8837 "LibraryWindow.c"
 		}
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = _tmp11_;
@@ -8798,10 +8848,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 8801 "LibraryWindow.c"
+#line 8851 "LibraryWindow.c"
 	}
-	goto __finally44;
-	__catch44_g_regex_error:
+	goto __finally48;
+	__catch48_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8812,9 +8862,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 8815 "LibraryWindow.c"
+#line 8865 "LibraryWindow.c"
 	}
-	__finally44:
+	__finally48:
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
@@ -8823,7 +8873,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return NULL;
-#line 8826 "LibraryWindow.c"
+#line 8876 "LibraryWindow.c"
 	}
 }
 
@@ -8841,188 +8891,188 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	gboolean _tmp13_;
 	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (uri != NULL);
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = uri;
-#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:1400: mount point reported: %s", _tmp0_);
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:1407: mount point reported: %s", _tmp0_);
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = uri;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp2_) {
-#line 8858 "LibraryWindow.c"
+#line 8908 "LibraryWindow.c"
 		const gchar* _tmp3_;
-#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = uri;
-#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1404: Unsupported mount scheme: %s", _tmp3_);
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", _tmp3_);
+#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8866 "LibraryWindow.c"
+#line 8916 "LibraryWindow.c"
 	}
-#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = uri;
-#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_file_new_for_uri (_tmp4_);
-#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp5_;
-#line 1412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 8876 "LibraryWindow.c"
+#line 8926 "LibraryWindow.c"
 	{
 		GMount* _tmp6_ = NULL;
 		GFile* _tmp7_;
 		GMount* _tmp8_;
 		GMount* _tmp9_;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = uri_file;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_);
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp8_;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8890 "LibraryWindow.c"
-			goto __catch43_g_error;
+#line 8940 "LibraryWindow.c"
+			goto __catch47_g_error;
 		}
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = NULL;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp9_;
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 8903 "LibraryWindow.c"
+#line 8953 "LibraryWindow.c"
 	}
-	goto __finally43;
-	__catch43_g_error:
+	goto __finally47;
+	__catch47_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_;
 		const gchar* _tmp11_;
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = err;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_->message;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1416: %s", _tmp11_);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1423: %s", _tmp11_);
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8929 "LibraryWindow.c"
+#line 8979 "LibraryWindow.c"
 	}
-	__finally43:
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally47:
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.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 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8944 "LibraryWindow.c"
+#line 8994 "LibraryWindow.c"
 	}
-#line 1422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt_uri = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = uri;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = g_str_has_prefix (_tmp12_, "file://");
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 8954 "LibraryWindow.c"
+#line 9004 "LibraryWindow.c"
 		const gchar* _tmp14_;
 		gchar* _tmp15_;
 		gchar* _tmp16_;
 		gchar* _tmp17_;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = uri;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = string_replace (_tmp14_, "file://", "disk:");
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = camera_table_get_port_uri (_tmp16_);
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (alt_uri);
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		alt_uri = _tmp17_;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp16_);
-#line 8973 "LibraryWindow.c"
+#line 9023 "LibraryWindow.c"
 	}
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = at_startup;
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp18_) {
-#line 8979 "LibraryWindow.c"
+#line 9029 "LibraryWindow.c"
 		const gchar* _tmp19_;
 		gboolean _tmp20_;
 		const gchar* _tmp23_;
 		gboolean _tmp24_;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = uri;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = is_string_empty (_tmp19_);
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp20_) {
-#line 8990 "LibraryWindow.c"
+#line 9040 "LibraryWindow.c"
 			GeeHashSet* _tmp21_;
 			const gchar* _tmp22_;
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = library_window_initial_camera_uris;
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = uri;
-#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 8999 "LibraryWindow.c"
+#line 9049 "LibraryWindow.c"
 		}
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = alt_uri;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = is_string_empty (_tmp23_);
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp24_) {
-#line 9007 "LibraryWindow.c"
+#line 9057 "LibraryWindow.c"
 			GeeHashSet* _tmp25_;
 			const gchar* _tmp26_;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = library_window_initial_camera_uris;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = alt_uri;
-#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 9016 "LibraryWindow.c"
+#line 9066 "LibraryWindow.c"
 		}
 	}
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (alt_uri);
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 9025 "LibraryWindow.c"
+#line 9075 "LibraryWindow.c"
 }
 
 
@@ -9039,97 +9089,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	GdkEventKey* _tmp13_;
 	guint _tmp14_;
 	const gchar* _tmp15_;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp3_, NULL);
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 9054 "LibraryWindow.c"
+#line 9104 "LibraryWindow.c"
 		SidebarTree* _tmp5_;
 		GdkEventKey* _tmp6_;
 		gboolean _tmp7_;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = event;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp7_;
-#line 9066 "LibraryWindow.c"
+#line 9116 "LibraryWindow.c"
 	} else {
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
-#line 9070 "LibraryWindow.c"
+#line 9120 "LibraryWindow.c"
 	}
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
-#line 9074 "LibraryWindow.c"
+#line 9124 "LibraryWindow.c"
 		SidebarTree* _tmp8_;
 		GdkEventKey* _tmp9_;
 		gboolean _tmp10_ = FALSE;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->sidebar_tree;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = event;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_);
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp10_;
-#line 9086 "LibraryWindow.c"
+#line 9136 "LibraryWindow.c"
 	} else {
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 9090 "LibraryWindow.c"
+#line 9140 "LibraryWindow.c"
 	}
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9098 "LibraryWindow.c"
+#line 9148 "LibraryWindow.c"
 	}
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = event;
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9110 "LibraryWindow.c"
+#line 9160 "LibraryWindow.c"
 	}
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = event;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _tmp13_->keyval;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = gdk_keyval_name (_tmp14_);
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (g_strcmp0 (_tmp15_, "Escape") == 0) {
-#line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_clear_search (self);
-#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9126 "LibraryWindow.c"
+#line 9176 "LibraryWindow.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9132 "LibraryWindow.c"
+#line 9182 "LibraryWindow.c"
 }
 
 
@@ -9145,14 +9195,14 @@ gint library_window_get_PAGE_MIN_WIDTH (void) {
 	result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2);
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9148 "LibraryWindow.c"
+#line 9198 "LibraryWindow.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 9155 "LibraryWindow.c"
+#line 9205 "LibraryWindow.c"
 }
 
 
@@ -9198,14 +9248,14 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co
 	self->priv->view = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 9201 "LibraryWindow.c"
+#line 9251 "LibraryWindow.c"
 }
 
 
 static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) {
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view);
-#line 9208 "LibraryWindow.c"
+#line 9258 "LibraryWindow.c"
 }
 
 
@@ -9226,7 +9276,7 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
 	library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_);
 #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page));
-#line 9229 "LibraryWindow.c"
+#line 9279 "LibraryWindow.c"
 }
 
 
@@ -9234,7 +9284,7 @@ static void library_window_fullscreen_photo_page_real_switching_from (Page* base
 	LibraryWindowFullscreenPhotoPage * self;
 #line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
-#line 9237 "LibraryWindow.c"
+#line 9287 "LibraryWindow.c"
 }
 
 
@@ -9249,7 +9299,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames
 	_tmp0_ = ui_filenames;
 #line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 9252 "LibraryWindow.c"
+#line 9302 "LibraryWindow.c"
 }
 
 
@@ -9266,14 +9316,14 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize;
-#line 9269 "LibraryWindow.c"
+#line 9319 "LibraryWindow.c"
 }
 
 
 static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) {
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self);
-#line 9276 "LibraryWindow.c"
+#line 9326 "LibraryWindow.c"
 }
 
 
@@ -9289,7 +9339,7 @@ static void library_window_fullscreen_photo_page_finalize (GObject * obj) {
 	_data_collection_unref0 (self->priv->view);
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj);
-#line 9292 "LibraryWindow.c"
+#line 9342 "LibraryWindow.c"
 }
 
 
@@ -9339,11 +9389,11 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_finalize;
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
-#line 9346 "LibraryWindow.c"
+#line 9396 "LibraryWindow.c"
 }
 
 
@@ -9376,115 +9426,117 @@ static void library_window_instance_init (LibraryWindow * self) {
 	_tmp1_ = g_strdup (_tmp0_);
 #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->import_dir = _tmp1_;
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->import_recursive = TRUE;
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp2_);
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->sidebar_paned = _tmp2_;
 #line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->sidebar_paned = _tmp2_;
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp3_);
-#line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->client_paned = _tmp3_;
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->client_paned = _tmp3_;
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp4_);
-#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->bottom_frame = _tmp4_;
-#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->properties_scheduler = NULL;
 #line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->properties_scheduler = NULL;
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->notify_library_is_home_dir = TRUE;
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_branch_new ();
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->library_branch = _tmp5_;
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->library_branch = _tmp5_;
+#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = tags_branch_new ();
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->tags_branch = _tmp6_;
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->tags_branch = _tmp6_;
+#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = folders_branch_new ();
-#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->folders_branch = _tmp7_;
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->folders_branch = _tmp7_;
+#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = events_branch_new ();
-#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->events_branch = _tmp8_;
 #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->events_branch = _tmp8_;
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = camera_branch_new ();
-#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->camera_branch = _tmp9_;
 #line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->camera_branch = _tmp9_;
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = searches_branch_new ();
-#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->saved_search_branch = _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->saved_search_branch = _tmp10_;
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = TRUE;
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_map = _tmp11_;
-#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->photo_page = NULL;
-#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = FALSE;
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = search_filter_actions_new ();
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_actions = _tmp12_;
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp13_);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->top_section = _tmp13_;
 #line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->top_section = _tmp13_;
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp14_);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_frame = _tmp14_;
 #line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_frame = _tmp14_;
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp15_);
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_bar = _tmp15_;
 #line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_bar = _tmp15_;
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_displayed = FALSE;
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = basic_properties_new ();
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp16_);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->basic_properties = _tmp16_;
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = (GtkStack*) gtk_stack_new ();
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->stack = _tmp17_;
 #line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->stack = _tmp17_;
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp18_);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->layout = _tmp18_;
-#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = (GtkRevealer*) gtk_revealer_new ();
-#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp19_);
-#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->toolbar_revealer = _tmp19_;
-#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->current_progress_priority = 0;
 #line 145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->current_progress_priority = 0;
+#line 146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
-#line 9487 "LibraryWindow.c"
+#line 9539 "LibraryWindow.c"
 }
 
 
@@ -9524,51 +9576,51 @@ static void library_window_finalize (GObject * obj) {
 	guint _tmp45_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_tree;
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE);
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self);
 #line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self);
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE);
-#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self);
 #line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self);
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE);
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self);
 #line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self);
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->sidebar_tree;
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self);
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_unsubscribe_from_basic_information (self, _tmp9_);
-#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp9_);
-#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->extended_properties;
-#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self);
 #line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self);
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->extended_properties;
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self);
-#line 9571 "LibraryWindow.c"
+#line 9623 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp14_;
@@ -9577,27 +9629,27 @@ static void library_window_finalize (GObject * obj) {
 		GeeCollection* _tmp17_;
 		GeeIterator* _tmp18_;
 		GeeIterator* _tmp19_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_collection_registry_get_instance ();
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = media_collection_registry_get_all (_tmp15_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = _tmp18_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp15_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp19_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 9600 "LibraryWindow.c"
+#line 9652 "LibraryWindow.c"
 			GeeIterator* _tmp20_;
 			gboolean _tmp21_;
 			MediaSourceCollection* media_sources = NULL;
@@ -9607,161 +9659,161 @@ static void library_window_finalize (GObject * obj) {
 			guint _tmp25_;
 			MediaSourceCollection* _tmp26_;
 			guint _tmp27_;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp21_) {
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 9618 "LibraryWindow.c"
+#line 9670 "LibraryWindow.c"
 			}
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = _media_sources_it;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp23_;
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp23_;
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp24_ = media_sources;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
 #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = media_sources;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE);
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 9640 "LibraryWindow.c"
+#line 9692 "LibraryWindow.c"
 		}
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 9644 "LibraryWindow.c"
+#line 9696 "LibraryWindow.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = metadata_writer_get_instance ();
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE);
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self);
-#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_monitor_pool_get_instance ();
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = library_monitor_pool_get_monitor (_tmp32_);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp32_);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp34_;
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp34_;
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = monitor;
-#line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ != NULL) {
-#line 9672 "LibraryWindow.c"
+#line 9724 "LibraryWindow.c"
 		LibraryMonitor* _tmp36_;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = monitor;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 9678 "LibraryWindow.c"
+#line 9730 "LibraryWindow.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = library_monitor_pool_get_instance ();
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = _tmp37_;
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp38_);
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp38_);
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = library_monitor_pool_get_instance ();
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self);
-#line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp41_);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = camera_table_get_instance ();
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp44_);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
 #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (self->priv->import_dir);
-#line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->sidebar_paned);
 #line 100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->client_paned);
+	_g_object_unref0 (self->priv->sidebar_paned);
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->client_paned);
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->bottom_frame);
-#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->sidebar_tree);
 #line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->library_branch);
+	_g_object_unref0 (self->priv->sidebar_tree);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->tags_branch);
+	_g_object_unref0 (self->priv->library_branch);
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->folders_branch);
+	_g_object_unref0 (self->priv->tags_branch);
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->events_branch);
+	_g_object_unref0 (self->priv->folders_branch);
 #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->camera_branch);
+	_g_object_unref0 (self->priv->events_branch);
 #line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->camera_branch);
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->saved_search_branch);
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->page_map);
-#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->photo_page);
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_search_filter_actions_unref0 (self->priv->search_actions);
 #line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_search_filter_actions_unref0 (self->priv->search_actions);
+#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->top_section);
 #line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->background_progress_frame);
+	_g_object_unref0 (self->priv->top_section);
 #line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->background_progress_frame);
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->background_progress_bar);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->basic_properties);
 #line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->basic_properties);
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->stack);
 #line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->layout);
+	_g_object_unref0 (self->priv->stack);
 #line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->right_vbox);
+	_g_object_unref0 (self->priv->layout);
 #line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->right_vbox);
+#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->toolbar_revealer);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_parent_class)->finalize (obj);
-#line 9764 "LibraryWindow.c"
+#line 9816 "LibraryWindow.c"
 }
 
 
@@ -9782,13 +9834,13 @@ static void _vala_library_window_get_property (GObject * object, guint property_
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	switch (property_id) {
-#line 9785 "LibraryWindow.c"
+#line 9837 "LibraryWindow.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		break;
-#line 9791 "LibraryWindow.c"
+#line 9843 "LibraryWindow.c"
 	}
 }
 
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 0a39318..47a0ad9 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -95,6 +95,7 @@ public class LibraryWindow : AppWindow {
     }
 
     private string import_dir = Environment.get_home_dir();
+    private bool import_recursive = true;
 
     private Gtk.Paned sidebar_paned = new Gtk.Paned(Gtk.Orientation.VERTICAL);
     private Gtk.Paned client_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
@@ -510,10 +511,15 @@ public class LibraryWindow : AppWindow {
         import_dialog.set_local_only(false);
         import_dialog.set_select_multiple(true);
         import_dialog.set_current_folder(import_dir);
+
+        var recursive = new Gtk.CheckButton.with_label(_("Recurse Into Subfolders"));
+        recursive.active = import_recursive;
+        import_dialog.set_extra_widget(recursive);
         
         int response = import_dialog.run();
         
         if (response == Gtk.ResponseType.OK) {
+            import_dialog.hide();
             // force file linking if directory is inside current library directory
             Gtk.ResponseType copy_files_response =
                 AppDirs.is_in_import_dir(File.new_for_uri(import_dialog.get_uri()))
@@ -521,11 +527,12 @@ public class LibraryWindow : AppWindow {
             
             if (copy_files_response != Gtk.ResponseType.CANCEL) {
                 dispatch_import_jobs(import_dialog.get_uris(), "folders",
-                    copy_files_response == Gtk.ResponseType.ACCEPT);
+                    copy_files_response == Gtk.ResponseType.ACCEPT, recursive.active);
             }
         }
         
         import_dir = import_dialog.get_current_folder();
+        import_recursive = recursive.active;
         import_dialog.destroy();
     }
     
@@ -645,7 +652,7 @@ public class LibraryWindow : AppWindow {
     }
     
     private void on_preferences() {
-        PreferencesDialog.show();
+        PreferencesDialog.show_preferences();
     }
     
     private void on_display_basic_properties(GLib.SimpleAction action, Variant? value) {
@@ -766,7 +773,7 @@ public class LibraryWindow : AppWindow {
         ImportUI.report_manifest(manifest, true);
     }
     
-    private void dispatch_import_jobs(GLib.SList<string> uris, string job_name, bool copy_to_library) {
+    private void dispatch_import_jobs(GLib.SList<string> uris, string job_name, bool copy_to_library, bool recurse) {
         if (AppDirs.get_import_dir().get_path() == Environment.get_home_dir() && notify_library_is_home_dir) {
             Gtk.ResponseType response = AppWindow.affirm_cancel_question(
                 _("Shotwell is configured to import photos to your home directory.\n" + 
@@ -790,7 +797,7 @@ public class LibraryWindow : AppWindow {
                 continue;
             }
 
-            jobs.add(new FileImportJob(file_or_dir, copy_to_library));
+            jobs.add(new FileImportJob(file_or_dir, copy_to_library, recurse));
         }
         
         if (jobs.size > 0) {
@@ -897,7 +904,7 @@ public class LibraryWindow : AppWindow {
             }
         }
         
-        dispatch_import_jobs(uris, "drag-and-drop", selected_action == Gdk.DragAction.COPY);
+        dispatch_import_jobs(uris, "drag-and-drop", selected_action == Gdk.DragAction.COPY, true);
         
         Gtk.drag_finish(context, true, false, time);
     }
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 98ee9c1..1e3ffc8 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -805,7 +805,6 @@ void page_remove_actions (Page* self, GActionMap* map);
 static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base);
 static void trash_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_set_action_important (Page* self, const gchar* name, gboolean important);
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important);
 void page_update_actions (Page* self, gint selected_count, gint count);
 gboolean data_collection_add (DataCollection* self, DataObject* object);
@@ -871,21 +870,21 @@ static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_del
 static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_on_delete ((TrashPage*) self);
-#line 875 "TrashPage.c"
+#line 874 "TrashPage.c"
 }
 
 
 static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_on_restore ((TrashPage*) self);
-#line 882 "TrashPage.c"
+#line 881 "TrashPage.c"
 }
 
 
 static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
 #line 38 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_on_trashcan_contents_altered ((TrashPage*) self, added, removed);
-#line 889 "TrashPage.c"
+#line 888 "TrashPage.c"
 }
 
 
@@ -952,14 +951,14 @@ TrashPage* trash_page_construct (GType object_type) {
 	_g_object_unref0 (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 956 "TrashPage.c"
+#line 955 "TrashPage.c"
 }
 
 
 TrashPage* trash_page_new (void) {
 #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_construct (TYPE_TRASH_PAGE);
-#line 963 "TrashPage.c"
+#line 962 "TrashPage.c"
 }
 
 
@@ -979,7 +978,7 @@ static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 	_tmp1_ = ui_filenames;
 #line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui");
-#line 983 "TrashPage.c"
+#line 982 "TrashPage.c"
 }
 
 
@@ -999,7 +998,7 @@ static void trash_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
-#line 1003 "TrashPage.c"
+#line 1002 "TrashPage.c"
 }
 
 
@@ -1014,7 +1013,7 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 	_tmp0_ = map;
 #line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 1018 "TrashPage.c"
+#line 1017 "TrashPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1026,11 +1025,11 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (TRASH_PAGE_entries);
 #line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (TRASH_PAGE_entries); entry_it = entry_it + 1) {
-#line 1030 "TrashPage.c"
+#line 1029 "TrashPage.c"
 			GActionEntry entry = {0};
 #line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			entry = entry_collection[entry_it];
-#line 1034 "TrashPage.c"
+#line 1033 "TrashPage.c"
 			{
 				GActionMap* _tmp1_;
 				GActionEntry _tmp2_;
@@ -1043,7 +1042,7 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 				_tmp3_ = _tmp2_.name;
 #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1047 "TrashPage.c"
+#line 1046 "TrashPage.c"
 			}
 		}
 	}
@@ -1053,7 +1052,7 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 1057 "TrashPage.c"
+#line 1056 "TrashPage.c"
 }
 
 
@@ -1072,7 +1071,7 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base
 	result = _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1076 "TrashPage.c"
+#line 1075 "TrashPage.c"
 }
 
 
@@ -1091,50 +1090,46 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin
 #line 75 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", has_selected);
 #line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", TRUE);
-#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", has_selected);
-#line 78 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", TRUE);
-#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE);
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = selected_count;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = count;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 1108 "TrashPage.c"
+#line 1103 "TrashPage.c"
 }
 
 
 static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_;
 	GeeCollection* _tmp12_;
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = added;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp0_ != NULL) {
-#line 1125 "TrashPage.c"
+#line 1120 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_;
 			GeeIterator* _tmp2_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp1_ = added;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp2_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1138 "TrashPage.c"
+#line 1133 "TrashPage.c"
 				GeeIterator* _tmp3_;
 				gboolean _tmp4_;
 				MediaSource* source = NULL;
@@ -1145,52 +1140,52 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp9_;
 				TrashPageTrashView* _tmp10_;
 				TrashPageTrashView* _tmp11_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp3_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp4_) {
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1157 "TrashPage.c"
+#line 1152 "TrashPage.c"
 				}
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp5_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp6_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp8_ = _tmp7_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp9_ = source;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp10_ = trash_page_trash_view_new (_tmp9_);
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp11_ = _tmp10_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp8_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1183 "TrashPage.c"
+#line 1178 "TrashPage.c"
 			}
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1187 "TrashPage.c"
+#line 1182 "TrashPage.c"
 		}
 	}
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp12_ = removed;
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp12_ != NULL) {
-#line 1194 "TrashPage.c"
+#line 1189 "TrashPage.c"
 		Marker* marker = NULL;
 		ViewCollection* _tmp13_;
 		ViewCollection* _tmp14_;
@@ -1199,32 +1194,32 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 		ViewCollection* _tmp29_;
 		ViewCollection* _tmp30_;
 		Marker* _tmp31_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp14_ = _tmp13_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp16_ = _tmp15_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		marker = _tmp16_;
-#line 1215 "TrashPage.c"
+#line 1210 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp17_;
 			GeeIterator* _tmp18_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp17_ = removed;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp18_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1228 "TrashPage.c"
+#line 1223 "TrashPage.c"
 				GeeIterator* _tmp19_;
 				gboolean _tmp20_;
 				MediaSource* source = NULL;
@@ -1236,61 +1231,61 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp26_;
 				DataView* _tmp27_;
 				DataView* _tmp28_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp19_ = _source_it;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp20_ = gee_iterator_next (_tmp19_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp20_) {
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1248 "TrashPage.c"
+#line 1243 "TrashPage.c"
 				}
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp21_ = _source_it;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp22_ = gee_iterator_get (_tmp21_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp22_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp23_ = marker;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp25_ = _tmp24_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp26_ = source;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp28_ = _tmp27_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp28_);
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp25_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1276 "TrashPage.c"
+#line 1271 "TrashPage.c"
 			}
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1280 "TrashPage.c"
+#line 1275 "TrashPage.c"
 		}
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp30_ = _tmp29_;
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp31_ = marker;
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp30_);
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_g_object_unref0 (marker);
-#line 1294 "TrashPage.c"
+#line 1289 "TrashPage.c"
 	}
 }
 
@@ -1308,51 +1303,51 @@ static void trash_page_on_restore (TrashPage* self) {
 	GeeCollection* _tmp9_;
 	TrashUntrashPhotosCommand* _tmp10_;
 	TrashUntrashPhotosCommand* _tmp11_;
-#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _tmp0_;
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp3_) {
-#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		return;
-#line 1328 "TrashPage.c"
+#line 1323 "TrashPage.c"
 	}
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp5_ = _tmp4_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = _tmp6_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp11_ = _tmp10_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_command_manager_unref0 (_tmp5_);
-#line 1356 "TrashPage.c"
+#line 1351 "TrashPage.c"
 }
 
 
@@ -1360,15 +1355,15 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
 	TrashPage * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = g_strdup (_ ("Trash is empty"));
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp0_;
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1372 "TrashPage.c"
+#line 1367 "TrashPage.c"
 }
 
 
@@ -1382,50 +1377,50 @@ static void trash_page_on_delete (TrashPage* self) {
 	ViewCollection* _tmp6_;
 	GeeList* _tmp7_;
 	GeeCollection* _tmp8_;
-#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = _tmp1_;
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = _tmp3_ == 1;
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp4_) {
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = "Deleting a Photo";
-#line 1402 "TrashPage.c"
+#line 1397 "TrashPage.c"
 	} else {
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = _ ("Deleting Photos");
-#line 1406 "TrashPage.c"
+#line 1401 "TrashPage.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = _tmp5_;
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = view_collection_get_selected_sources (_tmp6_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	remove_from_app (_tmp8_, _ ("Delete"), _tmp0_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1422 "TrashPage.c"
+#line 1417 "TrashPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1429 "TrashPage.c"
+#line 1424 "TrashPage.c"
 }
 
 
@@ -1434,17 +1429,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag
 	SearchViewFilter* result = NULL;
 	TrashPageTrashSearchViewFilter* _tmp0_;
 	SearchViewFilter* _tmp1_;
-#line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1448 "TrashPage.c"
+#line 1443 "TrashPage.c"
 }
 
 
@@ -1473,21 +1468,21 @@ static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, M
 	_vala_assert (_tmp4_, "source.is_trashed()");
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1477 "TrashPage.c"
+#line 1472 "TrashPage.c"
 }
 
 
 static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) {
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source);
-#line 1484 "TrashPage.c"
+#line 1479 "TrashPage.c"
 }
 
 
 static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) {
 #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_trash_view_parent_class = g_type_class_peek_parent (klass);
-#line 1491 "TrashPage.c"
+#line 1486 "TrashPage.c"
 }
 
 
@@ -1516,7 +1511,7 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1520 "TrashPage.c"
+#line 1515 "TrashPage.c"
 }
 
 
@@ -1526,14 +1521,14 @@ static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_const
 	self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1530 "TrashPage.c"
+#line 1525 "TrashPage.c"
 }
 
 
 static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) {
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER);
-#line 1537 "TrashPage.c"
+#line 1532 "TrashPage.c"
 }
 
 
@@ -1542,7 +1537,7 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch
 	trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) trash_page_trash_search_view_filter_real_get_criteria;
-#line 1546 "TrashPage.c"
+#line 1541 "TrashPage.c"
 }
 
 
@@ -1583,7 +1578,7 @@ static void trash_page_class_init (TrashPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) trash_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_page_finalize;
-#line 1587 "TrashPage.c"
+#line 1582 "TrashPage.c"
 }
 
 
@@ -1595,7 +1590,7 @@ static void trash_page_instance_init (TrashPage * self) {
 	_tmp0_ = trash_page_trash_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1599 "TrashPage.c"
+#line 1594 "TrashPage.c"
 }
 
 
@@ -1609,7 +1604,7 @@ static void trash_page_finalize (GObject * obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj);
-#line 1613 "TrashPage.c"
+#line 1608 "TrashPage.c"
 }
 
 
diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala
index c06fbbf..35dee4e 100644
--- a/src/library/TrashPage.vala
+++ b/src/library/TrashPage.vala
@@ -73,9 +73,7 @@ public class TrashPage : CheckerboardPage {
         bool has_selected = selected_count > 0;
         
         set_action_sensitive("Delete", has_selected);
-        set_action_important("Delete", true);
         set_action_sensitive("Restore", has_selected);
-        set_action_important("Restore", true);
         set_common_action_important("CommonEmptyTrash", true);
         
         base.update_actions(selected_count, count);
-- 
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/library/FlaggedPage.c             |  394 +-
 src/library/FlaggedSidebarEntry.c     |  296 +-
 src/library/ImportQueuePage.c         |  912 ++---
 src/library/ImportQueueSidebarEntry.c |  165 +-
 src/library/LastImportPage.c          |  448 ++-
 src/library/LastImportSidebarEntry.c  |  188 +-
 src/library/Library.c                 |   15 +-
 src/library/LibraryBranch.c           |  926 +++--
 src/library/LibraryWindow.c           | 6586 +++++++++++++++++----------------
 src/library/OfflinePage.c             |  797 ++--
 src/library/OfflineSidebarEntry.c     |  253 +-
 src/library/TrashPage.c               |  729 ++--
 src/library/TrashSidebarEntry.c       |  294 +-
 13 files changed, 6503 insertions(+), 5500 deletions(-)

(limited to 'src/library')

diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 16a31da..199e911 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.36.6, the Vala compiler
+/* FlaggedPage.c generated by valac 0.40.4, the Vala compiler
  * generated from FlaggedPage.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 <gtk/gtk.h>
@@ -251,6 +252,11 @@ typedef struct _CollectionPageCollectionSearchViewFilterClass CollectionPageColl
 
 typedef struct _FlaggedPageFlaggedSearchViewFilter FlaggedPageFlaggedSearchViewFilter;
 typedef struct _FlaggedPageFlaggedSearchViewFilterClass FlaggedPageFlaggedSearchViewFilterClass;
+enum  {
+	FLAGGED_PAGE_0_PROPERTY,
+	FLAGGED_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* flagged_page_properties[FLAGGED_PAGE_NUM_PROPERTIES];
 #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
 #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
 #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
@@ -686,9 +692,15 @@ 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 checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -702,17 +714,29 @@ 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;
@@ -724,42 +748,62 @@ GType collection_page_get_type (void) G_GNUC_CONST;
 GType flagged_page_get_type (void) G_GNUC_CONST;
 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;
 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;
 GType default_search_view_filter_get_type (void) G_GNUC_CONST;
 GType collection_page_collection_search_view_filter_get_type (void) G_GNUC_CONST;
 static GType flagged_page_flagged_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define FLAGGED_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FLAGGED_PAGE, FlaggedPagePrivate))
-enum  {
-	FLAGGED_PAGE_DUMMY_PROPERTY
-};
-Alteration* alteration_new (const gchar* subject, const gchar* detail);
-Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail);
+Alteration* alteration_new (const gchar* subject,
+                            const gchar* detail);
+Alteration* alteration_construct (GType object_type,
+                                  const gchar* subject,
+                                  const gchar* detail);
 static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void);
 static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_construct (GType object_type);
 #define FLAGGED_PAGE_NAME _ ("Flagged")
 FlaggedPage* flagged_page_new (void);
 FlaggedPage* flagged_page_construct (GType object_type);
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
+CollectionPage* collection_page_construct (GType object_type,
+                                           const gchar* page_name);
 static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner);
-static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner);
+static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type,
+                                                                            FlaggedPage* owner);
 GType collection_view_manager_get_type (void) G_GNUC_CONST;
 static GType flagged_page_flagged_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 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;
@@ -767,9 +811,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);
@@ -778,33 +828,49 @@ GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 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);
-static void flagged_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);
+static void flagged_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 flagged_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);
+void configuration_facade_get_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean* sort_order,
+                                                   gint* sort_by);
+static void flagged_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 SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base);
-enum  {
-	FLAGGED_PAGE_FLAGGED_VIEW_MANAGER_DUMMY_PROPERTY
-};
 CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
-static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, DataSource* source);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+                                                          CollectionPage* page);
+static gboolean flagged_page_flagged_view_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;
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
-enum  {
-	FLAGGED_PAGE_FLAGGED_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
 static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void);
@@ -812,7 +878,9 @@ CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view
 static void flagged_page_finalize (GObject * obj);
 
 
-FlaggedPage* flagged_page_construct (GType object_type) {
+FlaggedPage*
+flagged_page_construct (GType object_type)
+{
 	FlaggedPage * self = NULL;
 	FlaggedPageFlaggedViewManager* _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -823,7 +891,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 	_view_manager_unref0 (self->priv->view_manager);
 #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->view_manager = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 827 "FlaggedPage.c"
+#line 895 "FlaggedPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp1_;
@@ -852,75 +920,78 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 		_sources_it = _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		while (TRUE) {
-#line 856 "FlaggedPage.c"
+#line 924 "FlaggedPage.c"
 			GeeIterator* _tmp7_;
-			gboolean _tmp8_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp9_;
-			gpointer _tmp10_;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			ViewCollection* _tmp10_;
 			ViewCollection* _tmp11_;
-			ViewCollection* _tmp12_;
-			MediaSourceCollection* _tmp13_;
-			ViewManager* _tmp14_;
-			Alteration* _tmp15_;
+			MediaSourceCollection* _tmp12_;
+			ViewManager* _tmp13_;
+			Alteration* _tmp14_;
+			ViewCollectionMonitor* _tmp15_;
 			ViewCollectionMonitor* _tmp16_;
-			ViewCollectionMonitor* _tmp17_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_tmp7_ = _sources_it;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			if (!_tmp8_) {
+			if (!gee_iterator_next (_tmp7_)) {
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 				break;
-#line 877 "FlaggedPage.c"
+#line 942 "FlaggedPage.c"
 			}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp9_ = _sources_it;
+			_tmp8_ = _sources_it;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp10_ = gee_iterator_get (_tmp9_);
+			_tmp9_ = gee_iterator_get (_tmp8_);
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			sources = (MediaSourceCollection*) _tmp10_;
+			sources = (MediaSourceCollection*) _tmp9_;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp12_ = _tmp11_;
+			_tmp11_ = _tmp10_;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp13_ = sources;
+			_tmp12_ = sources;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp14_ = self->priv->view_manager;
+			_tmp13_ = self->priv->view_manager;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp15_ = self->priv->prereq;
+			_tmp14_ = self->priv->prereq;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp16_ = view_collection_monitor_source_collection (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, _tmp15_, NULL, NULL, NULL);
+			_tmp15_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_, _tmp14_, NULL, NULL, NULL);
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp17_ = _tmp16_;
+			_tmp16_ = _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_view_collection_monitor_unref0 (_tmp17_);
+			_view_collection_monitor_unref0 (_tmp16_);
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_data_collection_unref0 (_tmp12_);
+			_data_collection_unref0 (_tmp11_);
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_data_collection_unref0 (sources);
-#line 905 "FlaggedPage.c"
+#line 970 "FlaggedPage.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 909 "FlaggedPage.c"
+#line 974 "FlaggedPage.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 913 "FlaggedPage.c"
+#line 978 "FlaggedPage.c"
 }
 
 
-FlaggedPage* flagged_page_new (void) {
+FlaggedPage*
+flagged_page_new (void)
+{
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_construct (TYPE_FLAGGED_PAGE);
-#line 920 "FlaggedPage.c"
+#line 987 "FlaggedPage.c"
 }
 
 
-static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+flagged_page_real_get_config_photos_sort (MediaPage* base,
+                                          gboolean* sort_order,
+                                          gint* sort_by)
+{
 	FlaggedPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -946,23 +1017,25 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	if (sort_order) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_order = _vala_sort_order;
-#line 950 "FlaggedPage.c"
+#line 1021 "FlaggedPage.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (sort_by) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_by = _vala_sort_by;
-#line 956 "FlaggedPage.c"
+#line 1027 "FlaggedPage.c"
 	}
 }
 
 
-static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+flagged_page_real_set_config_photos_sort (MediaPage* base,
+                                          gboolean sort_order,
+                                          gint sort_by)
+{
 	FlaggedPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 46 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -970,25 +1043,25 @@ static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_tmp1_ = _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp2_ = sort_order;
-#line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp3_ = sort_by;
-#line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.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 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 981 "FlaggedPage.c"
+#line 1050 "FlaggedPage.c"
 }
 
 
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 988 "FlaggedPage.c"
+#line 1059 "FlaggedPage.c"
 }
 
 
-static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+flagged_page_real_get_search_view_filter (CheckerboardPage* base)
+{
 	FlaggedPage * self;
 	SearchViewFilter* result = NULL;
 	FlaggedPageFlaggedSearchViewFilter* _tmp0_;
@@ -1003,100 +1076,107 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP
 	result = _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1007 "FlaggedPage.c"
+#line 1080 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner) {
+static FlaggedPageFlaggedViewManager*
+flagged_page_flagged_view_manager_construct (GType object_type,
+                                             FlaggedPage* owner)
+{
 	FlaggedPageFlaggedViewManager* self = NULL;
-	FlaggedPage* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_return_val_if_fail (IS_FLAGGED_PAGE (owner), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp0_ = owner;
-#line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
+	self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1022 "FlaggedPage.c"
+#line 1095 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner) {
+static FlaggedPageFlaggedViewManager*
+flagged_page_flagged_view_manager_new (FlaggedPage* owner)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_view_manager_construct (FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, owner);
-#line 1029 "FlaggedPage.c"
+#line 1104 "FlaggedPage.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1036 "FlaggedPage.c"
+#line 1113 "FlaggedPage.c"
 }
 
 
-static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, DataSource* source) {
+static gboolean
+flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base,
+                                                        DataSource* source)
+{
 	FlaggedPageFlaggedViewManager * self;
 	gboolean result = FALSE;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp0_;
-	Flaggable* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	Flaggable* _tmp3_;
+	Flaggable* _tmp0_;
+	gboolean _tmp1_ = FALSE;
+	Flaggable* _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, FlaggedPageFlaggedViewManager);
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp0_ = source;
-#line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL);
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_FLAGGABLE) ? ((Flaggable*) source) : NULL);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	flaggable = _tmp1_;
+	flaggable = _tmp0_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp3_ = flaggable;
+	_tmp2_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	if (_tmp3_ != NULL) {
-#line 1062 "FlaggedPage.c"
-		Flaggable* _tmp4_;
-		gboolean _tmp5_;
+	if (_tmp2_ != NULL) {
+#line 1139 "FlaggedPage.c"
+		Flaggable* _tmp3_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp4_ = flaggable;
+		_tmp3_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp5_ = flaggable_is_flagged (_tmp4_);
-#line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp2_ = _tmp5_;
-#line 1071 "FlaggedPage.c"
+		_tmp1_ = flaggable_is_flagged (_tmp3_);
+#line 1145 "FlaggedPage.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp2_ = FALSE;
-#line 1075 "FlaggedPage.c"
+		_tmp1_ = FALSE;
+#line 1149 "FlaggedPage.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_g_object_unref0 (flaggable);
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1083 "FlaggedPage.c"
+#line 1157 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedViewManagerClass * klass) {
+static void
+flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedViewManagerClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view;
-#line 1092 "FlaggedPage.c"
+#line 1168 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_view_manager_instance_init (FlaggedPageFlaggedViewManager * self) {
+static void
+flagged_page_flagged_view_manager_instance_init (FlaggedPageFlaggedViewManager * self)
+{
 }
 
 
-static GType flagged_page_flagged_view_manager_get_type (void) {
+static GType
+flagged_page_flagged_view_manager_get_type (void)
+{
 	static volatile gsize flagged_page_flagged_view_manager_type_id__volatile = 0;
 	if (g_once_init_enter (&flagged_page_flagged_view_manager_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageFlaggedViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_flagged_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPageFlaggedViewManager), 0, (GInstanceInitFunc) flagged_page_flagged_view_manager_instance_init, NULL };
@@ -1108,7 +1188,9 @@ static GType flagged_page_flagged_view_manager_get_type (void) {
 }
 
 
-static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
 	FlaggedPageFlaggedSearchViewFilter * self;
 	guint result = 0U;
 #line 23 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1117,41 +1199,51 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) (((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 24 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1121 "FlaggedPage.c"
+#line 1203 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_construct (GType object_type) {
+static FlaggedPageFlaggedSearchViewFilter*
+flagged_page_flagged_search_view_filter_construct (GType object_type)
+{
 	FlaggedPageFlaggedSearchViewFilter* self = NULL;
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = (FlaggedPageFlaggedSearchViewFilter*) collection_page_collection_search_view_filter_construct (object_type);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1131 "FlaggedPage.c"
+#line 1215 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void) {
+static FlaggedPageFlaggedSearchViewFilter*
+flagged_page_flagged_search_view_filter_new (void)
+{
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_search_view_filter_construct (FLAGGED_PAGE_TYPE_FLAGGED_SEARCH_VIEW_FILTER);
-#line 1138 "FlaggedPage.c"
+#line 1224 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlaggedSearchViewFilterClass * klass) {
+static void
+flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlaggedSearchViewFilterClass * klass)
+{
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) flagged_page_flagged_search_view_filter_real_get_criteria;
-#line 1147 "FlaggedPage.c"
+#line 1235 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_search_view_filter_instance_init (FlaggedPageFlaggedSearchViewFilter * self) {
+static void
+flagged_page_flagged_search_view_filter_instance_init (FlaggedPageFlaggedSearchViewFilter * self)
+{
 }
 
 
-static GType flagged_page_flagged_search_view_filter_get_type (void) {
+static GType
+flagged_page_flagged_search_view_filter_get_type (void)
+{
 	static volatile gsize flagged_page_flagged_search_view_filter_type_id__volatile = 0;
 	if (g_once_init_enter (&flagged_page_flagged_search_view_filter_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageFlaggedSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_flagged_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPageFlaggedSearchViewFilter), 0, (GInstanceInitFunc) flagged_page_flagged_search_view_filter_instance_init, NULL };
@@ -1163,7 +1255,9 @@ static GType flagged_page_flagged_search_view_filter_get_type (void) {
 }
 
 
-static void flagged_page_class_init (FlaggedPageClass * klass) {
+static void
+flagged_page_class_init (FlaggedPageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1176,11 +1270,13 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) flagged_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize;
-#line 1180 "FlaggedPage.c"
+#line 1274 "FlaggedPage.c"
 }
 
 
-static void flagged_page_instance_init (FlaggedPage * self) {
+static void
+flagged_page_instance_init (FlaggedPage * self)
+{
 	Alteration* _tmp0_;
 	FlaggedPageFlaggedSearchViewFilter* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1193,11 +1289,13 @@ static void flagged_page_instance_init (FlaggedPage * self) {
 	_tmp1_ = flagged_page_flagged_search_view_filter_new ();
 #line 31 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->search_filter = _tmp1_;
-#line 1197 "FlaggedPage.c"
+#line 1293 "FlaggedPage.c"
 }
 
 
-static void flagged_page_finalize (GObject * obj) {
+static void
+flagged_page_finalize (GObject * obj)
+{
 	FlaggedPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAGGED_PAGE, FlaggedPage);
@@ -1209,11 +1307,13 @@ static void flagged_page_finalize (GObject * obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (flagged_page_parent_class)->finalize (obj);
-#line 1213 "FlaggedPage.c"
+#line 1311 "FlaggedPage.c"
 }
 
 
-GType flagged_page_get_type (void) {
+GType
+flagged_page_get_type (void)
+{
 	static volatile gsize flagged_page_type_id__volatile = 0;
 	if (g_once_init_enter (&flagged_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPage), 0, (GInstanceInitFunc) flagged_page_instance_init, NULL };
diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 01f84fd..b42df00 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from FlaggedSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -149,6 +150,11 @@ typedef struct _MediaSourceClass MediaSourceClass;
 typedef struct _LibraryFlaggedSidebarEntry LibraryFlaggedSidebarEntry;
 typedef struct _LibraryFlaggedSidebarEntryClass LibraryFlaggedSidebarEntryClass;
 typedef struct _LibraryFlaggedSidebarEntryPrivate LibraryFlaggedSidebarEntryPrivate;
+enum  {
+	LIBRARY_FLAGGED_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_FLAGGED_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_flagged_sidebar_entry_properties[LIBRARY_FLAGGED_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -375,14 +381,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST;
 GType library_flagged_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_FLAGGED_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 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;
@@ -390,20 +399,28 @@ 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);
 GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
 static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self);
-static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self);
+static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender,
+                                                                                                                  gpointer self);
 LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void);
 LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type);
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
 static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 #define FLAGGED_PAGE_NAME _ ("Flagged")
 static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -415,40 +432,56 @@ 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 flagged_page_get_type (void) G_GNUC_CONST;
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media);
+static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+                                                                    GeeList* media);
 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);
-FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag);
-FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
+FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources,
+                                            gboolean flag);
+FlagUnflagCommand* flag_unflag_command_construct (GType object_type,
+                                                  GeeCollection* sources,
+                                                  gboolean flag);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
 GType flag_unflag_command_get_type (void) G_GNUC_CONST;
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data);
+static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+                                                                              GtkSelectionData* data);
 GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self);
 static void library_flagged_sidebar_entry_finalize (GObject * obj);
 
 
-static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self) {
+static void
+_library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender,
+                                                                                                             gpointer self)
+{
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_on_flagged_contents_altered ((LibraryFlaggedSidebarEntry*) self);
-#line 443 "FlaggedSidebarEntry.c"
+#line 475 "FlaggedSidebarEntry.c"
 }
 
 
-LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type) {
+LibraryFlaggedSidebarEntry*
+library_flagged_sidebar_entry_construct (GType object_type)
+{
 	LibraryFlaggedSidebarEntry * self = NULL;
-	gint _tmp11_;
 #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = (LibraryFlaggedSidebarEntry*) library_hideable_page_entry_construct (object_type);
-#line 452 "FlaggedSidebarEntry.c"
+#line 485 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -477,59 +510,58 @@ LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType objec
 		_media_sources_it = _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
-#line 481 "FlaggedSidebarEntry.c"
+#line 514 "FlaggedSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 				break;
-#line 496 "FlaggedSidebarEntry.c"
+#line 526 "FlaggedSidebarEntry.c"
 			}
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			g_signal_connect_object (_tmp10_, "flagged-contents-altered", (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "flagged-contents-altered", (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self, 0);
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 510 "FlaggedSidebarEntry.c"
+#line 540 "FlaggedSidebarEntry.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 514 "FlaggedSidebarEntry.c"
+#line 544 "FlaggedSidebarEntry.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp11_ = library_flagged_sidebar_entry_get_total_flagged (self);
-#line 12 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp11_ != 0);
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_flagged_sidebar_entry_get_total_flagged (self) != 0);
 #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return self;
-#line 522 "FlaggedSidebarEntry.c"
+#line 550 "FlaggedSidebarEntry.c"
 }
 
 
-LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void) {
+LibraryFlaggedSidebarEntry*
+library_flagged_sidebar_entry_new (void)
+{
 #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return library_flagged_sidebar_entry_construct (LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY);
-#line 529 "FlaggedSidebarEntry.c"
+#line 559 "FlaggedSidebarEntry.c"
 }
 
 
-static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -541,11 +573,13 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimple
 	result = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 545 "FlaggedSidebarEntry.c"
+#line 577 "FlaggedSidebarEntry.c"
 }
 
 
-static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -557,11 +591,13 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimple
 	result = _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 561 "FlaggedSidebarEntry.c"
+#line 595 "FlaggedSidebarEntry.c"
 }
 
 
-static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryFlaggedSidebarEntry * self;
 	Page* result = NULL;
 	FlaggedPage* _tmp0_;
@@ -575,18 +611,20 @@ static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEn
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 29 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 579 "FlaggedSidebarEntry.c"
+#line 615 "FlaggedSidebarEntry.c"
 }
 
 
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
+static gboolean
+library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+                                                           GeeList* media)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gboolean result = FALSE;
 	CommandManager* _tmp0_;
 	CommandManager* _tmp1_;
-	GeeList* _tmp2_;
+	FlagUnflagCommand* _tmp2_;
 	FlagUnflagCommand* _tmp3_;
-	FlagUnflagCommand* _tmp4_;
 #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
 #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -596,26 +634,27 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received (Sideb
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	_tmp1_ = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp2_ = media;
-#line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp3_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
+	_tmp2_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_COMMAND, Command));
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	_command_manager_unref0 (_tmp1_);
 #line 35 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	result = TRUE;
 #line 35 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 615 "FlaggedSidebarEntry.c"
+#line 651 "FlaggedSidebarEntry.c"
 }
 
 
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) {
+static gboolean
+library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+                                                                     GtkSelectionData* data)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gboolean result = FALSE;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -626,30 +665,31 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitr
 	result = FALSE;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 630 "FlaggedSidebarEntry.c"
+#line 669 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self) {
-	gint _tmp0_;
+static void
+library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self)
+{
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self));
 #line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp0_ = library_flagged_sidebar_entry_get_total_flagged (self);
-#line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp0_ != 0);
-#line 642 "FlaggedSidebarEntry.c"
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_flagged_sidebar_entry_get_total_flagged (self) != 0);
+#line 680 "FlaggedSidebarEntry.c"
 }
 
 
-static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self) {
+static gint
+library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self)
+{
 	gint result = 0;
 	gint total = 0;
 #line 46 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	g_return_val_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self), 0);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	total = 0;
-#line 653 "FlaggedSidebarEntry.c"
+#line 693 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -678,67 +718,66 @@ static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSideb
 		_media_sources_it = _tmp5_;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
-#line 682 "FlaggedSidebarEntry.c"
+#line 722 "FlaggedSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			gint _tmp10_;
-			MediaSourceCollection* _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			gint _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			GeeCollection* _tmp11_;
 			GeeCollection* _tmp12_;
-			GeeCollection* _tmp13_;
+			gint _tmp13_;
 			gint _tmp14_;
-			gint _tmp15_;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 				break;
-#line 702 "FlaggedSidebarEntry.c"
+#line 739 "FlaggedSidebarEntry.c"
 			}
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp10_ = total;
+			_tmp9_ = total;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp11_ = media_sources;
+			_tmp10_ = media_sources;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp12_ = media_source_collection_get_flagged (_tmp11_);
+			_tmp11_ = media_source_collection_get_flagged (_tmp10_);
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp13_ = _tmp12_;
+			_tmp12_ = _tmp11_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp14_ = gee_collection_get_size (_tmp13_);
+			_tmp13_ = gee_collection_get_size (_tmp12_);
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp15_ = _tmp14_;
+			_tmp14_ = _tmp13_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			total = _tmp10_ + _tmp15_;
+			total = _tmp9_ + _tmp14_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_g_object_unref0 (_tmp13_);
+			_g_object_unref0 (_tmp12_);
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 728 "FlaggedSidebarEntry.c"
+#line 765 "FlaggedSidebarEntry.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 732 "FlaggedSidebarEntry.c"
+#line 769 "FlaggedSidebarEntry.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	result = total;
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 738 "FlaggedSidebarEntry.c"
+#line 775 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntryClass * klass) {
+static void
+library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntryClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -749,30 +788,36 @@ static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntry
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_flagged_sidebar_entry_finalize;
-#line 753 "FlaggedSidebarEntry.c"
+#line 792 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
+static void
+library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_flagged_sidebar_entry_real_internal_drop_received;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_flagged_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 764 "FlaggedSidebarEntry.c"
+#line 805 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEntry * self) {
+static void
+library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEntry * self)
+{
 }
 
 
-static void library_flagged_sidebar_entry_finalize (GObject * obj) {
+static void
+library_flagged_sidebar_entry_finalize (GObject * obj)
+{
 	LibraryFlaggedSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
-#line 776 "FlaggedSidebarEntry.c"
+#line 821 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -801,51 +846,50 @@ static void library_flagged_sidebar_entry_finalize (GObject * obj) {
 		_media_sources_it = _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
-#line 805 "FlaggedSidebarEntry.c"
+#line 850 "FlaggedSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			guint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
+			guint _tmp10_;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 				break;
-#line 821 "FlaggedSidebarEntry.c"
+#line 863 "FlaggedSidebarEntry.c"
 			}
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			g_signal_parse_name ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 837 "FlaggedSidebarEntry.c"
+#line 879 "FlaggedSidebarEntry.c"
 		}
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 841 "FlaggedSidebarEntry.c"
+#line 883 "FlaggedSidebarEntry.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	G_OBJECT_CLASS (library_flagged_sidebar_entry_parent_class)->finalize (obj);
-#line 845 "FlaggedSidebarEntry.c"
+#line 887 "FlaggedSidebarEntry.c"
 }
 
 
-GType library_flagged_sidebar_entry_get_type (void) {
+GType
+library_flagged_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_flagged_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_flagged_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryFlaggedSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_flagged_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryFlaggedSidebarEntry), 0, (GInstanceInitFunc) library_flagged_sidebar_entry_instance_init, NULL };
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index c8d1841..df6b6a0 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -1,4 +1,4 @@
-/* ImportQueuePage.c generated by valac 0.36.6, the Vala compiler
+/* ImportQueuePage.c generated by valac 0.40.4, the Vala compiler
  * generated from ImportQueuePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -110,6 +111,11 @@ typedef struct _ImportQueuePagePrivate ImportQueuePagePrivate;
 
 typedef struct _BatchImport BatchImport;
 typedef struct _BatchImportClass BatchImportClass;
+enum  {
+	IMPORT_QUEUE_PAGE_0_PROPERTY,
+	IMPORT_QUEUE_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* import_queue_page_properties[IMPORT_QUEUE_PAGE_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define TYPE_DATA_OBJECT (data_object_get_type ())
@@ -300,9 +306,9 @@ typedef struct _VideoViewClass VideoViewClass;
 enum  {
 	IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL,
 	IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL,
-	IMPORT_QUEUE_PAGE_LAST_SIGNAL
+	IMPORT_QUEUE_PAGE_NUM_SIGNALS
 };
-static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_LAST_SIGNAL] = {0};
+static guint import_queue_page_signals[IMPORT_QUEUE_PAGE_NUM_SIGNALS] = {0};
 #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; }
@@ -449,9 +455,15 @@ 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 single_photo_page_get_type (void) G_GNUC_CONST;
@@ -463,71 +475,130 @@ GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST;
 GType import_queue_page_get_type (void) G_GNUC_CONST;
 GType batch_import_get_type (void) G_GNUC_CONST;
 #define IMPORT_QUEUE_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_IMPORT_QUEUE_PAGE, ImportQueuePagePrivate))
-enum  {
-	IMPORT_QUEUE_PAGE_DUMMY_PROPERTY
-};
 #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…")
 static void import_queue_page_on_stop (ImportQueuePage* self);
-static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                  GVariant* parameter,
+                                                                  gpointer self);
 ImportQueuePage* import_queue_page_new (void);
 ImportQueuePage* import_queue_page_construct (GType object_type);
-SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport);
+SinglePhotoPage* single_photo_page_construct (GType object_type,
+                                              const gchar* page_name,
+                                              gboolean scale_up_to_viewport);
 GtkToolbar* page_get_toolbar (Page* self);
-static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void import_queue_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void import_queue_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
-void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel);
-static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import);
-static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self);
+static void import_queue_page_real_init_collect_ui_filenames (Page* base,
+                                                       GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void import_queue_page_real_add_actions (Page* base,
+                                         GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+static void import_queue_page_real_remove_actions (Page* base,
+                                            GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
+void import_queue_page_enqueue_and_schedule (ImportQueuePage* self,
+                                             BatchImport* batch_import,
+                                             gboolean allow_user_cancel);
+static void import_queue_page_on_starting (ImportQueuePage* self,
+                                    BatchImport* batch_import);
+static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender,
+                                                           gpointer self);
 static void import_queue_page_on_preparing (ImportQueuePage* self);
-static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self);
-static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes);
-static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self);
+static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender,
+                                                             gpointer self);
+static void import_queue_page_on_progress (ImportQueuePage* self,
+                                    guint64 completed_bytes,
+                                    guint64 total_bytes);
+static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender,
+                                                           guint64 completed_bytes,
+                                                           guint64 total_bytes,
+                                                           gpointer self);
 GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
-static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow);
+static void import_queue_page_on_imported (ImportQueuePage* self,
+                                    ThumbnailSource* source,
+                                    GdkPixbuf* pixbuf,
+                                    gint to_follow);
 GType media_source_get_type (void) G_GNUC_CONST;
-static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self);
+static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender,
+                                                           MediaSource* source,
+                                                           GdkPixbuf* pixbuf,
+                                                           gint to_follow,
+                                                           gpointer self);
 gpointer import_manifest_ref (gpointer instance);
 void import_manifest_unref (gpointer instance);
-GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_import_manifest (GValue* value, gpointer v_object);
-void value_take_import_manifest (GValue* value, gpointer v_object);
+GParamSpec* param_spec_import_manifest (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_import_manifest (GValue* value,
+                                gpointer v_object);
+void value_take_import_manifest (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_import_manifest (const GValue* value);
 GType import_manifest_get_type (void) G_GNUC_CONST;
 gpointer batch_import_roll_ref (gpointer instance);
 void batch_import_roll_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_roll (GValue* value, gpointer v_object);
-void value_take_batch_import_roll (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_roll (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_batch_import_roll (GValue* value,
+                                  gpointer v_object);
+void value_take_batch_import_roll (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_batch_import_roll (const GValue* value);
 GType batch_import_roll_get_type (void) G_GNUC_CONST;
-static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll);
-static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self);
+static void import_queue_page_on_import_complete (ImportQueuePage* self,
+                                           BatchImport* batch_import,
+                                           ImportManifest* manifest,
+                                           BatchImportRoll* import_roll);
+static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender,
+                                                                         ImportManifest* manifest,
+                                                                         BatchImportRoll* import_roll,
+                                                                         gpointer self);
 GType import_result_get_type (void) G_GNUC_CONST;
-static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message);
-static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self);
+static void import_queue_page_on_fatal_error (ImportQueuePage* self,
+                                       ImportResult _result_,
+                                       const gchar* message);
+static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender,
+                                                                 ImportResult _result_,
+                                                                 const gchar* message,
+                                                                 gpointer self);
 void batch_import_schedule (BatchImport* self);
 static void import_queue_page_update_stop_action (ImportQueuePage* self);
 gint import_queue_page_get_batch_count (ImportQueuePage* self);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
+void page_set_action_sensitive (Page* self,
+                                const gchar* name,
+                                gboolean sensitive);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 void page_window_set_busy_cursor (PageWindow* self);
 void batch_import_user_halt (BatchImport* self);
 gboolean page_is_in_view (Page* self);
 GType direction_get_type (void) G_GNUC_CONST;
-void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
+void single_photo_page_set_pixbuf (SinglePhotoPage* self,
+                                   GdkPixbuf* unscaled,
+                                   Dimensions* max_dim,
+                                   Direction* direction);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf,
+                            Dimensions* result);
 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 view_collection_get_type (void) G_GNUC_CONST;
@@ -536,33 +607,43 @@ void data_collection_clear (DataCollection* self);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType library_photo_get_type (void) G_GNUC_CONST;
-gboolean data_collection_add (DataCollection* self, DataObject* object);
+gboolean data_collection_add (DataCollection* self,
+                              DataObject* object);
 PhotoView* photo_view_new (PhotoSource* source);
-PhotoView* photo_view_construct (GType object_type, PhotoSource* source);
+PhotoView* photo_view_construct (GType object_type,
+                                 PhotoSource* source);
 GType data_view_get_type (void) G_GNUC_CONST;
 GType thumbnail_view_get_type (void) G_GNUC_CONST;
 GType photo_view_get_type (void) G_GNUC_CONST;
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 VideoView* video_view_new (VideoSource* source);
-VideoView* video_view_construct (GType object_type, VideoSource* source);
+VideoView* video_view_construct (GType object_type,
+                                 VideoSource* source);
 GType video_view_get_type (void) G_GNUC_CONST;
 gchar* data_object_get_name (DataObject* self);
 void single_photo_page_blank_display (SinglePhotoPage* self);
 void page_window_set_normal_cursor (PageWindow* self);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+void app_window_error_message (const gchar* message,
+                               GtkWindow* parent);
 static void import_queue_page_finalize (GObject * obj);
 
 static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}};
 
-static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action,
+                                                             GVariant* parameter,
+                                                             gpointer self)
+{
 #line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_stop ((ImportQueuePage*) self);
-#line 562 "ImportQueuePage.c"
+#line 641 "ImportQueuePage.c"
 }
 
 
-ImportQueuePage* import_queue_page_construct (GType object_type) {
+ImportQueuePage*
+import_queue_page_construct (GType object_type)
+{
 	ImportQueuePage * self = NULL;
 	GtkToolbar* toolbar = NULL;
 	GtkToolbar* _tmp0_;
@@ -589,7 +670,7 @@ ImportQueuePage* import_queue_page_construct (GType object_type) {
 #line 32 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_tool_button_set_icon_name (stop_button, "stop");
 #line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Stop");
+	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_actionable_get_type (), GtkActionable), "win.Stop");
 #line 35 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -630,69 +711,65 @@ ImportQueuePage* import_queue_page_construct (GType object_type) {
 	_g_object_unref0 (toolbar);
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self;
-#line 634 "ImportQueuePage.c"
+#line 715 "ImportQueuePage.c"
 }
 
 
-ImportQueuePage* import_queue_page_new (void) {
+ImportQueuePage*
+import_queue_page_new (void)
+{
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE);
-#line 641 "ImportQueuePage.c"
+#line 724 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+import_queue_page_real_init_collect_ui_filenames (Page* base,
+                                                  GeeList* ui_filenames)
+{
 	ImportQueuePage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 56 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 57 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp0_ = ui_filenames;
-#line 57 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "import_queue.ui");
-#line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = ui_filenames;
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "import_queue.ui");
 #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 661 "ImportQueuePage.c"
+	PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), ui_filenames);
+#line 741 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+import_queue_page_real_add_actions (Page* base,
+                                    GActionMap* map)
+{
 	ImportQueuePage * self;
-	GActionMap* _tmp0_;
-	GActionMap* _tmp1_;
 #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp0_ = map;
-#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = map;
+	PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), map);
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_action_map_add_action_entries (_tmp1_, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self);
-#line 681 "ImportQueuePage.c"
+	g_action_map_add_action_entries (map, IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self);
+#line 758 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+import_queue_page_real_remove_actions (Page* base,
+                                       GActionMap* map)
+{
 	ImportQueuePage * self;
-	GActionMap* _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
 #line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp0_ = map;
-#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 696 "ImportQueuePage.c"
+	PAGE_CLASS (import_queue_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), map);
+#line 773 "ImportQueuePage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -704,89 +781,106 @@ static void import_queue_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries);
 #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries); entry_it = entry_it + 1) {
-#line 708 "ImportQueuePage.c"
+#line 785 "ImportQueuePage.c"
 			GActionEntry entry = {0};
 #line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			entry = entry_collection[entry_it];
-#line 712 "ImportQueuePage.c"
+#line 789 "ImportQueuePage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
-#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-				_tmp1_ = map;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-				_tmp2_ = entry;
+				_tmp0_ = entry;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-				_tmp3_ = _tmp2_.name;
+				_tmp1_ = _tmp0_.name;
 #line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 725 "ImportQueuePage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 799 "ImportQueuePage.c"
 			}
 		}
 	}
 }
 
 
-static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) {
+static void
+_import_queue_page_on_starting_batch_import_starting (BatchImport* _sender,
+                                                      gpointer self)
+{
 #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_starting ((ImportQueuePage*) self, _sender);
-#line 735 "ImportQueuePage.c"
+#line 812 "ImportQueuePage.c"
 }
 
 
-static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) {
+static void
+_import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender,
+                                                        gpointer self)
+{
 #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_preparing ((ImportQueuePage*) self);
-#line 742 "ImportQueuePage.c"
+#line 822 "ImportQueuePage.c"
 }
 
 
-static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
+static void
+_import_queue_page_on_progress_batch_import_progress (BatchImport* _sender,
+                                                      guint64 completed_bytes,
+                                                      guint64 total_bytes,
+                                                      gpointer self)
+{
 #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes);
-#line 749 "ImportQueuePage.c"
+#line 834 "ImportQueuePage.c"
 }
 
 
-static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) {
+static void
+_import_queue_page_on_imported_batch_import_imported (BatchImport* _sender,
+                                                      MediaSource* source,
+                                                      GdkPixbuf* pixbuf,
+                                                      gint to_follow,
+                                                      gpointer self)
+{
 #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow);
-#line 756 "ImportQueuePage.c"
+#line 847 "ImportQueuePage.c"
 }
 
 
-static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
+static void
+_import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender,
+                                                                    ImportManifest* manifest,
+                                                                    BatchImportRoll* import_roll,
+                                                                    gpointer self)
+{
 #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll);
-#line 763 "ImportQueuePage.c"
+#line 859 "ImportQueuePage.c"
 }
 
 
-static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) {
+static void
+_import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender,
+                                                            ImportResult _result_,
+                                                            const gchar* message,
+                                                            gpointer self)
+{
 #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message);
-#line 770 "ImportQueuePage.c"
+#line 871 "ImportQueuePage.c"
 }
 
 
-void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel) {
+void
+import_queue_page_enqueue_and_schedule (ImportQueuePage* self,
+                                        BatchImport* batch_import,
+                                        gboolean allow_user_cancel)
+{
 	GeeArrayList* _tmp0_;
-	BatchImport* _tmp1_;
-	gboolean _tmp2_;
-	BatchImport* _tmp3_;
-	BatchImport* _tmp4_;
-	BatchImport* _tmp5_;
-	BatchImport* _tmp6_;
-	BatchImport* _tmp7_;
-	BatchImport* _tmp8_;
-	gboolean _tmp9_;
-	GeeArrayList* _tmp12_;
-	BatchImport* _tmp13_;
-	BatchImport* _tmp14_;
-	GeeArrayList* _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
+	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
 #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -794,83 +888,56 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 #line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
 #line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = batch_import;
-#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_vala_assert (!_tmp2_, "!queue.contains(batch_import)");
+	_vala_assert (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import), "!queue.contains(batch_import)");
 #line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = batch_import;
-#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_connect_object (_tmp3_, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0);
-#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp4_ = batch_import;
+	g_signal_connect_object (batch_import, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0);
 #line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_connect_object (_tmp4_, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0);
+	g_signal_connect_object (batch_import, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0);
 #line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp5_ = batch_import;
-#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_connect_object (_tmp5_, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0);
-#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp6_ = batch_import;
+	g_signal_connect_object (batch_import, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0);
 #line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_connect_object (_tmp6_, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0);
-#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp7_ = batch_import;
+	g_signal_connect_object (batch_import, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0);
 #line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_connect_object (_tmp7_, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0);
+	g_signal_connect_object (batch_import, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0);
 #line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp8_ = batch_import;
-#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_connect_object (_tmp8_, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0);
-#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp9_ = allow_user_cancel;
+	g_signal_connect_object (batch_import, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0);
 #line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (!_tmp9_) {
-#line 831 "ImportQueuePage.c"
-		GeeHashSet* _tmp10_;
-		BatchImport* _tmp11_;
+	if (!allow_user_cancel) {
+#line 907 "ImportQueuePage.c"
+		GeeHashSet* _tmp1_;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp10_ = self->priv->cancel_unallowed;
+		_tmp1_ = self->priv->cancel_unallowed;
 #line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp11_ = batch_import;
-#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 840 "ImportQueuePage.c"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import);
+#line 913 "ImportQueuePage.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp12_ = self->priv->queue;
-#line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp13_ = batch_import;
+	_tmp2_ = self->priv->queue;
 #line 92 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import);
 #line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp14_ = batch_import;
-#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, _tmp14_);
+	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL], 0, batch_import);
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp15_ = self->priv->queue;
+	_tmp3_ = self->priv->queue;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp17_ = _tmp16_;
+	_tmp5_ = _tmp4_;
 #line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (_tmp17_ == 1) {
-#line 860 "ImportQueuePage.c"
-		BatchImport* _tmp18_;
-#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp18_ = batch_import;
+	if (_tmp5_ == 1) {
 #line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		batch_import_schedule (_tmp18_);
-#line 866 "ImportQueuePage.c"
+		batch_import_schedule (batch_import);
+#line 931 "ImportQueuePage.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 870 "ImportQueuePage.c"
+#line 935 "ImportQueuePage.c"
 }
 
 
-gint import_queue_page_get_batch_count (ImportQueuePage* self) {
+gint
+import_queue_page_get_batch_count (ImportQueuePage* self)
+{
 	gint result = 0;
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
@@ -887,15 +954,16 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 	result = _tmp2_;
 #line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return result;
-#line 891 "ImportQueuePage.c"
+#line 958 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_update_stop_action (ImportQueuePage* self) {
+static void
+import_queue_page_update_stop_action (ImportQueuePage* self)
+{
 	gboolean _tmp0_ = FALSE;
 	GeeHashSet* _tmp1_;
 	BatchImport* _tmp2_;
-	gboolean _tmp3_;
 #line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -903,41 +971,43 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->current_batch;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
-#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (!_tmp3_) {
-#line 910 "ImportQueuePage.c"
-		GeeArrayList* _tmp4_;
+	if (!gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_)) {
+#line 976 "ImportQueuePage.c"
+		GeeArrayList* _tmp3_;
+		gint _tmp4_;
 		gint _tmp5_;
-		gint _tmp6_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp4_ = self->priv->queue;
+		_tmp3_ = self->priv->queue;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp0_ = _tmp6_ > 0;
-#line 922 "ImportQueuePage.c"
+		_tmp0_ = _tmp5_ > 0;
+#line 988 "ImportQueuePage.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = FALSE;
-#line 926 "ImportQueuePage.c"
+#line 992 "ImportQueuePage.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_);
-#line 930 "ImportQueuePage.c"
+#line 996 "ImportQueuePage.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 937 "ImportQueuePage.c"
+#line 1005 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_on_stop (ImportQueuePage* self) {
+static void
+import_queue_page_on_stop (ImportQueuePage* self)
+{
 	GeeArrayList* _tmp0_;
 	gint _tmp1_;
 	gint _tmp2_;
@@ -957,7 +1027,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	if (_tmp2_ == 0) {
 #line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 961 "ImportQueuePage.c"
+#line 1031 "ImportQueuePage.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = app_window_get_instance ();
@@ -969,7 +1039,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	_g_object_unref0 (_tmp4_);
 #line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->stopped = TRUE;
-#line 973 "ImportQueuePage.c"
+#line 1043 "ImportQueuePage.c"
 	{
 		GeeArrayList* _batch_import_list = NULL;
 		GeeArrayList* _tmp5_;
@@ -997,7 +1067,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 		_batch_import_index = -1;
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		while (TRUE) {
-#line 1001 "ImportQueuePage.c"
+#line 1071 "ImportQueuePage.c"
 			gint _tmp10_;
 			gint _tmp11_;
 			gint _tmp12_;
@@ -1018,7 +1088,7 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			if (!(_tmp11_ < _tmp12_)) {
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				break;
-#line 1022 "ImportQueuePage.c"
+#line 1092 "ImportQueuePage.c"
 			}
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp13_ = _batch_import_list;
@@ -1034,18 +1104,20 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			batch_import_user_halt (_tmp16_);
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_g_object_unref0 (batch_import);
-#line 1038 "ImportQueuePage.c"
+#line 1108 "ImportQueuePage.c"
 		}
 #line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_batch_import_list);
-#line 1042 "ImportQueuePage.c"
+#line 1112 "ImportQueuePage.c"
 	}
 }
 
 
-static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) {
+static void
+import_queue_page_on_starting (ImportQueuePage* self,
+                               BatchImport* batch_import)
+{
 	BatchImport* _tmp0_;
-	BatchImport* _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1053,18 +1125,18 @@ static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* b
 #line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
 #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp0_ = batch_import;
-#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (batch_import);
 #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (self->priv->current_batch);
 #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	self->priv->current_batch = _tmp1_;
-#line 1064 "ImportQueuePage.c"
+	self->priv->current_batch = _tmp0_;
+#line 1134 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_on_preparing (ImportQueuePage* self) {
+static void
+import_queue_page_on_preparing (ImportQueuePage* self)
+{
 	GtkProgressBar* _tmp0_;
 	GtkProgressBar* _tmp1_;
 #line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1077,66 +1149,57 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) {
 	_tmp1_ = self->priv->progress_bar;
 #line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_pulse (_tmp1_);
-#line 1081 "ImportQueuePage.c"
+#line 1153 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_on_progress (ImportQueuePage* self, guint64 completed_bytes, guint64 total_bytes) {
+static void
+import_queue_page_on_progress (ImportQueuePage* self,
+                               guint64 completed_bytes,
+                               guint64 total_bytes)
+{
 	gdouble _tmp0_ = 0.0;
-	guint64 _tmp1_;
-	guint64 _tmp2_;
 	gdouble pct = 0.0;
-	GtkProgressBar* _tmp5_;
+	GtkProgressBar* _tmp1_;
 #line 133 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = completed_bytes;
-#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_ = total_bytes;
-#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (_tmp1_ <= _tmp2_) {
-#line 1099 "ImportQueuePage.c"
-		guint64 _tmp3_;
-		guint64 _tmp4_;
+	if (completed_bytes <= total_bytes) {
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp3_ = completed_bytes;
-#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp4_ = total_bytes;
-#line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_);
-#line 1108 "ImportQueuePage.c"
+		_tmp0_ = ((gdouble) completed_bytes) / ((gdouble) total_bytes);
+#line 1171 "ImportQueuePage.c"
 	} else {
 #line 135 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = 0.0;
-#line 1112 "ImportQueuePage.c"
+#line 1175 "ImportQueuePage.c"
 	}
 #line 134 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	pct = _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp5_ = self->priv->progress_bar;
+	_tmp1_ = self->priv->progress_bar;
 #line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_fraction (_tmp5_, pct);
-#line 1120 "ImportQueuePage.c"
+	gtk_progress_bar_set_fraction (_tmp1_, pct);
+#line 1183 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSource* source, GdkPixbuf* pixbuf, gint to_follow) {
+static void
+import_queue_page_on_imported (ImportQueuePage* self,
+                               ThumbnailSource* source,
+                               GdkPixbuf* pixbuf,
+                               gint to_follow)
+{
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_;
-	GdkPixbuf* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	Dimensions _tmp5_ = {0};
-	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	gboolean _tmp8_ = FALSE;
-	ThumbnailSource* _tmp9_;
-	GtkProgressBar* _tmp22_;
-	GtkProgressBar* _tmp23_;
-	ThumbnailSource* _tmp24_;
-	gchar* _tmp25_;
-	gchar* _tmp26_;
-	gchar* _tmp27_;
-	gchar* _tmp28_;
+	Dimensions _tmp1_ = {0};
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
+	gboolean _tmp4_ = FALSE;
+	GtkProgressBar* _tmp13_;
+	GtkProgressBar* _tmp14_;
+	gchar* _tmp15_;
+	gchar* _tmp16_;
+	gchar* _tmp17_;
+	gchar* _tmp18_;
 #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1144,158 +1207,126 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 #line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = to_follow;
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (_tmp1_ > 0) {
+	if (to_follow > 0) {
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = TRUE;
-#line 1153 "ImportQueuePage.c"
+#line 1214 "ImportQueuePage.c"
 	} else {
-		gboolean _tmp2_;
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp0_ = !_tmp2_;
-#line 1160 "ImportQueuePage.c"
+		_tmp0_ = !page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 1218 "ImportQueuePage.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp0_) {
 #line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 1166 "ImportQueuePage.c"
+#line 1224 "ImportQueuePage.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = pixbuf;
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp4_ = pixbuf;
+	dimensions_for_pixbuf (pixbuf, &_tmp1_);
 #line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	dimensions_for_pixbuf (_tmp4_, &_tmp5_);
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp3_, &_tmp5_, NULL);
+	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), pixbuf, &_tmp1_, NULL);
 #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = _tmp2_;
 #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection));
 #line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_data_collection_unref0 (_tmp7_);
-#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp9_ = source;
-#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) {
-#line 1188 "ImportQueuePage.c"
-		ViewCollection* _tmp10_;
-		ViewCollection* _tmp11_;
-		ThumbnailSource* _tmp12_;
-		PhotoView* _tmp13_;
-		PhotoView* _tmp14_;
-		gboolean _tmp15_;
-#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_data_collection_unref0 (_tmp3_);
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp11_ = _tmp10_;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO)) {
+#line 1240 "ImportQueuePage.c"
+		ViewCollection* _tmp5_;
+		ViewCollection* _tmp6_;
+		PhotoView* _tmp7_;
+		PhotoView* _tmp8_;
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp12_ = source;
+		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp13_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp12_) : NULL, TYPE_PHOTO_SOURCE, PhotoSource));
+		_tmp6_ = _tmp5_;
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp7_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) source) : NULL, TYPE_PHOTO_SOURCE, PhotoSource));
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp15_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
+		_tmp8_ = _tmp7_;
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp8_ = _tmp15_;
+		_tmp4_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_g_object_unref0 (_tmp14_);
+		_g_object_unref0 (_tmp8_);
 #line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_data_collection_unref0 (_tmp11_);
-#line 1213 "ImportQueuePage.c"
+		_data_collection_unref0 (_tmp6_);
+#line 1259 "ImportQueuePage.c"
 	} else {
-		ViewCollection* _tmp16_;
-		ViewCollection* _tmp17_;
-		ThumbnailSource* _tmp18_;
-		VideoView* _tmp19_;
-		VideoView* _tmp20_;
-		gboolean _tmp21_;
-#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp17_ = _tmp16_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		VideoView* _tmp11_;
+		VideoView* _tmp12_;
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp18_ = source;
+		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp19_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO) ? ((Video*) _tmp18_) : NULL, TYPE_VIDEO_SOURCE, VideoSource));
+		_tmp10_ = _tmp9_;
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp11_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_VIDEO) ? ((Video*) source) : NULL, TYPE_VIDEO_SOURCE, VideoSource));
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp21_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject));
+		_tmp12_ = _tmp11_;
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp8_ = _tmp21_;
+		_tmp4_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_g_object_unref0 (_tmp20_);
+		_g_object_unref0 (_tmp12_);
 #line 153 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_data_collection_unref0 (_tmp17_);
-#line 1239 "ImportQueuePage.c"
+		_data_collection_unref0 (_tmp10_);
+#line 1279 "ImportQueuePage.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp22_ = self->priv->progress_bar;
+	_tmp13_ = self->priv->progress_bar;
 #line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE);
-#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp23_ = self->priv->progress_bar;
+	gtk_progress_bar_set_ellipsize (_tmp13_, PANGO_ELLIPSIZE_MIDDLE);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp24_ = source;
+	_tmp14_ = self->priv->progress_bar;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp25_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject));
+	_tmp15_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_DATA_OBJECT, DataObject));
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp26_ = _tmp25_;
+	_tmp16_ = _tmp15_;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp27_ = g_strdup_printf (_ ("Imported %s"), _tmp26_);
+	_tmp17_ = g_strdup_printf (_ ("Imported %s"), _tmp16_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp28_ = _tmp27_;
+	_tmp18_ = _tmp17_;
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_text (_tmp23_, _tmp28_);
+	gtk_progress_bar_set_text (_tmp14_, _tmp18_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_free0 (_tmp28_);
+	_g_free0 (_tmp18_);
 #line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_free0 (_tmp26_);
-#line 1263 "ImportQueuePage.c"
+	_g_free0 (_tmp16_);
+#line 1301 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchImport* batch_import, ImportManifest* manifest, BatchImportRoll* import_roll) {
+static void
+import_queue_page_on_import_complete (ImportQueuePage* self,
+                                      BatchImport* batch_import,
+                                      ImportManifest* manifest,
+                                      BatchImportRoll* import_roll)
+{
 	BatchImport* _tmp0_;
-	BatchImport* _tmp1_;
-	GeeArrayList* _tmp2_;
+	GeeArrayList* _tmp1_;
+	gint _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
-	GeeArrayList* _tmp5_;
-	gpointer _tmp6_;
-	BatchImport* _tmp7_;
-	BatchImport* _tmp8_;
+	GeeArrayList* _tmp4_;
+	gpointer _tmp5_;
+	BatchImport* _tmp6_;
 	gboolean removed = FALSE;
-	GeeArrayList* _tmp9_;
-	BatchImport* _tmp10_;
-	gboolean _tmp11_;
-	gboolean _tmp12_;
-	GeeHashSet* _tmp13_;
-	BatchImport* _tmp14_;
-	BatchImport* _tmp15_;
-	guint _tmp16_;
-	BatchImport* _tmp17_;
-	guint _tmp18_;
-	BatchImport* _tmp19_;
-	guint _tmp20_;
-	BatchImport* _tmp21_;
-	guint _tmp22_;
-	BatchImport* _tmp23_;
-	guint _tmp24_;
-	BatchImport* _tmp25_;
-	guint _tmp26_;
-	GeeArrayList* _tmp27_;
-	gint _tmp28_;
-	gint _tmp29_;
-	BatchImport* _tmp39_;
+	GeeArrayList* _tmp7_;
+	gboolean _tmp8_;
+	GeeHashSet* _tmp9_;
+	guint _tmp10_;
+	guint _tmp11_;
+	guint _tmp12_;
+	guint _tmp13_;
+	guint _tmp14_;
+	guint _tmp15_;
+	GeeArrayList* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1305,177 +1336,156 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 #line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
 #line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp0_ = batch_import;
+	_tmp0_ = self->priv->current_batch;
 #line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = self->priv->current_batch;
-#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch");
+	_vala_assert (batch_import == _tmp0_, "batch_import == current_batch");
 #line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (self->priv->current_batch);
 #line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->current_batch = NULL;
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_ = self->priv->queue;
+	_tmp1_ = self->priv->queue;
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp2_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_vala_assert (_tmp4_ > 0, "queue.size > 0");
+	_vala_assert (_tmp3_ > 0, "queue.size > 0");
 #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp5_ = self->priv->queue;
+	_tmp4_ = self->priv->queue;
 #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+	_tmp5_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
 #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp7_ = (BatchImport*) _tmp6_;
+	_tmp6_ = (BatchImport*) _tmp5_;
 #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp8_ = batch_import;
+	_vala_assert (_tmp6_ == batch_import, "queue.get(0) == batch_import");
 #line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import");
-#line 165 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_object_unref0 (_tmp7_);
-#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp9_ = self->priv->queue;
+	_g_object_unref0 (_tmp6_);
 #line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp10_ = batch_import;
+	_tmp7_ = self->priv->queue;
 #line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp11_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	removed = _tmp11_;
+	removed = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import);
 #line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp12_ = removed;
+	_tmp8_ = removed;
 #line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_vala_assert (_tmp12_, "removed");
-#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp13_ = self->priv->cancel_unallowed;
+	_vala_assert (_tmp8_, "removed");
 #line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp14_ = batch_import;
+	_tmp9_ = self->priv->cancel_unallowed;
 #line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
-#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp15_ = batch_import;
+	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), batch_import);
 #line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE);
+	g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp10_, NULL, FALSE);
 #line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self);
+	g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self);
 #line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp17_ = batch_import;
+	g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp11_, NULL, FALSE);
 #line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE);
-#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self);
-#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp19_ = batch_import;
+	g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self);
 #line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE);
+	g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp12_, NULL, FALSE);
 #line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self);
+	g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self);
 #line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp21_ = batch_import;
+	g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp13_, NULL, FALSE);
 #line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE);
-#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_handlers_disconnect_matched (_tmp21_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self);
-#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp23_ = batch_import;
+	g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self);
 #line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE);
+	g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp14_, NULL, FALSE);
 #line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self);
-#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp25_ = batch_import;
+	g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self);
 #line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE);
+	g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp15_, NULL, FALSE);
 #line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self);
+	g_signal_handlers_disconnect_matched (batch_import, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self);
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp27_ = self->priv->queue;
+	_tmp16_ = self->priv->queue;
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp29_ = _tmp28_;
+	_tmp18_ = _tmp17_;
 #line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (_tmp29_ > 0) {
-#line 1400 "ImportQueuePage.c"
-		GeeArrayList* _tmp30_;
-		gpointer _tmp31_;
-		BatchImport* _tmp32_;
+	if (_tmp18_ > 0) {
+#line 1409 "ImportQueuePage.c"
+		GeeArrayList* _tmp19_;
+		gpointer _tmp20_;
+		BatchImport* _tmp21_;
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp30_ = self->priv->queue;
+		_tmp19_ = self->priv->queue;
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp31_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+		_tmp20_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp32_ = (BatchImport*) _tmp31_;
+		_tmp21_ = (BatchImport*) _tmp20_;
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		batch_import_schedule (_tmp32_);
+		batch_import_schedule (_tmp21_);
 #line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_g_object_unref0 (_tmp32_);
-#line 1414 "ImportQueuePage.c"
+		_g_object_unref0 (_tmp21_);
+#line 1423 "ImportQueuePage.c"
 	} else {
-		GtkProgressBar* _tmp33_;
-		GtkProgressBar* _tmp34_;
-		GtkProgressBar* _tmp35_;
-		gboolean _tmp36_;
+		GtkProgressBar* _tmp22_;
+		GtkProgressBar* _tmp23_;
+		GtkProgressBar* _tmp24_;
+		gboolean _tmp25_;
 #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp33_ = self->priv->progress_bar;
+		_tmp22_ = self->priv->progress_bar;
 #line 186 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE);
+		gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_NONE);
 #line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp34_ = self->priv->progress_bar;
+		_tmp23_ = self->priv->progress_bar;
 #line 187 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		gtk_progress_bar_set_text (_tmp34_, "");
+		gtk_progress_bar_set_text (_tmp23_, "");
 #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp35_ = self->priv->progress_bar;
+		_tmp24_ = self->priv->progress_bar;
 #line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		gtk_progress_bar_set_fraction (_tmp35_, 0.0);
+		gtk_progress_bar_set_fraction (_tmp24_, 0.0);
 #line 195 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		single_photo_page_blank_display (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		_tmp36_ = self->priv->stopped;
+		_tmp25_ = self->priv->stopped;
 #line 198 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		if (_tmp36_) {
-#line 1438 "ImportQueuePage.c"
-			AppWindow* _tmp37_;
-			AppWindow* _tmp38_;
+		if (_tmp25_) {
+#line 1447 "ImportQueuePage.c"
+			AppWindow* _tmp26_;
+			AppWindow* _tmp27_;
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-			_tmp37_ = app_window_get_instance ();
+			_tmp26_ = app_window_get_instance ();
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-			_tmp38_ = _tmp37_;
+			_tmp27_ = _tmp26_;
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PAGE_WINDOW, PageWindow));
 #line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-			_g_object_unref0 (_tmp38_);
-#line 1449 "ImportQueuePage.c"
+			_g_object_unref0 (_tmp27_);
+#line 1458 "ImportQueuePage.c"
 		}
 #line 201 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		self->priv->stopped = FALSE;
-#line 1453 "ImportQueuePage.c"
+#line 1462 "ImportQueuePage.c"
 	}
 #line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
 #line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp39_ = batch_import;
-#line 207 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, _tmp39_);
-#line 1461 "ImportQueuePage.c"
+	g_signal_emit (self, import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL], 0, batch_import);
+#line 1468 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) {
-	const gchar* _tmp0_;
+static void
+import_queue_page_on_fatal_error (ImportQueuePage* self,
+                                  ImportResult _result_,
+                                  const gchar* message)
+{
 #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
 #line 210 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (message != NULL);
 #line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp0_ = message;
-#line 211 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	app_window_error_message (_tmp0_, NULL);
-#line 1475 "ImportQueuePage.c"
+	app_window_error_message (message, NULL);
+#line 1483 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_class_init (ImportQueuePageClass * klass) {
+static void
+import_queue_page_class_init (ImportQueuePageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -1492,11 +1502,13 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) {
 	import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_ADDED_SIGNAL] = g_signal_new ("batch-added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_signals[IMPORT_QUEUE_PAGE_BATCH_REMOVED_SIGNAL] = g_signal_new ("batch-removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
-#line 1496 "ImportQueuePage.c"
+#line 1506 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_instance_init (ImportQueuePage * self) {
+static void
+import_queue_page_instance_init (ImportQueuePage * self)
+{
 	GeeArrayList* _tmp0_;
 	GeeHashSet* _tmp1_;
 	GtkProgressBar* _tmp2_;
@@ -1520,11 +1532,13 @@ static void import_queue_page_instance_init (ImportQueuePage * self) {
 	self->priv->progress_bar = _tmp2_;
 #line 14 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->stopped = FALSE;
-#line 1524 "ImportQueuePage.c"
+#line 1536 "ImportQueuePage.c"
 }
 
 
-static void import_queue_page_finalize (GObject * obj) {
+static void
+import_queue_page_finalize (GObject * obj)
+{
 	ImportQueuePage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
@@ -1538,11 +1552,13 @@ static void import_queue_page_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	G_OBJECT_CLASS (import_queue_page_parent_class)->finalize (obj);
-#line 1542 "ImportQueuePage.c"
+#line 1556 "ImportQueuePage.c"
 }
 
 
-GType import_queue_page_get_type (void) {
+GType
+import_queue_page_get_type (void)
+{
 	static volatile gsize import_queue_page_type_id__volatile = 0;
 	if (g_once_init_enter (&import_queue_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ImportQueuePageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) import_queue_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ImportQueuePage), 0, (GInstanceInitFunc) import_queue_page_instance_init, NULL };
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index bd9e970..b878989 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -1,4 +1,4 @@
-/* ImportQueueSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* ImportQueueSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from ImportQueueSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -100,6 +101,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
 typedef struct _LibraryImportQueueSidebarEntry LibraryImportQueueSidebarEntry;
 typedef struct _LibraryImportQueueSidebarEntryClass LibraryImportQueueSidebarEntryClass;
 typedef struct _LibraryImportQueueSidebarEntryPrivate LibraryImportQueueSidebarEntryPrivate;
+enum  {
+	LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_import_queue_sidebar_entry_properties[LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_SINGLE_PHOTO_PAGE (single_photo_page_get_type ())
 #define SINGLE_PHOTO_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage))
@@ -201,17 +207,19 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
 GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_IMPORT_QUEUE_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void);
 LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type);
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
 static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self);
-static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self);
+static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender,
+                                                                                                   Page* page,
+                                                                                                   gpointer self);
 static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self);
-static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender,
+                                                                                                         Page* page,
+                                                                                                         gpointer self);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…")
 static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -225,28 +233,46 @@ static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (Libra
 Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
 static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self);
 GType batch_import_get_type (void) G_GNUC_CONST;
-static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self);
-static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self);
+static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender,
+                                                                                                  BatchImport* batch_import,
+                                                                                                  gpointer self);
+static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender,
+                                                                                                    BatchImport* batch_import,
+                                                                                                    gpointer self);
 gint import_queue_page_get_batch_count (ImportQueuePage* self);
-void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel);
-void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel);
-
-
-static void _library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
+void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self,
+                                                              BatchImport* batch_import,
+                                                              gboolean allow_user_cancel);
+void import_queue_page_enqueue_and_schedule (ImportQueuePage* self,
+                                             BatchImport* batch_import,
+                                             gboolean allow_user_cancel);
+
+
+static void
+_library_import_queue_sidebar_entry_on_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender,
+                                                                                              Page* page,
+                                                                                              gpointer self)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	library_import_queue_sidebar_entry_on_page_created ((LibraryImportQueueSidebarEntry*) self);
-#line 239 "ImportQueueSidebarEntry.c"
+#line 259 "ImportQueueSidebarEntry.c"
 }
 
 
-static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
+static void
+_library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender,
+                                                                                                    Page* page,
+                                                                                                    gpointer self)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	library_import_queue_sidebar_entry_on_destroying_page ((LibraryImportQueueSidebarEntry*) self);
-#line 246 "ImportQueueSidebarEntry.c"
+#line 270 "ImportQueueSidebarEntry.c"
 }
 
 
-LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type) {
+LibraryImportQueueSidebarEntry*
+library_import_queue_sidebar_entry_construct (GType object_type)
+{
 	LibraryImportQueueSidebarEntry * self = NULL;
 #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	self = (LibraryImportQueueSidebarEntry*) library_hideable_page_entry_construct (object_type);
@@ -258,18 +284,22 @@ LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GT
 	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), FALSE);
 #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	return self;
-#line 262 "ImportQueueSidebarEntry.c"
+#line 288 "ImportQueueSidebarEntry.c"
 }
 
 
-LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void) {
+LibraryImportQueueSidebarEntry*
+library_import_queue_sidebar_entry_new (void)
+{
 #line 8 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	return library_import_queue_sidebar_entry_construct (LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY);
-#line 269 "ImportQueueSidebarEntry.c"
+#line 297 "ImportQueueSidebarEntry.c"
 }
 
 
-static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryImportQueueSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -281,11 +311,13 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarS
 	result = _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	return result;
-#line 285 "ImportQueueSidebarEntry.c"
+#line 315 "ImportQueueSidebarEntry.c"
 }
 
 
-static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryImportQueueSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -297,11 +329,13 @@ static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarS
 	result = _tmp0_;
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	return result;
-#line 301 "ImportQueueSidebarEntry.c"
+#line 333 "ImportQueueSidebarEntry.c"
 }
 
 
-static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryImportQueueSidebarEntry * self;
 	Page* result = NULL;
 	ImportQueuePage* _tmp0_;
@@ -315,11 +349,13 @@ static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimpleP
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 28 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	return result;
-#line 319 "ImportQueueSidebarEntry.c"
+#line 353 "ImportQueueSidebarEntry.c"
 }
 
 
-static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self) {
+static ImportQueuePage*
+library_import_queue_sidebar_entry_get_queue_page (LibraryImportQueueSidebarEntry* self)
+{
 	ImportQueuePage* result = NULL;
 	Page* _tmp0_;
 	ImportQueuePage* _tmp1_;
@@ -333,31 +369,41 @@ static ImportQueuePage* library_import_queue_sidebar_entry_get_queue_page (Libra
 	if (_tmp1_ == NULL) {
 #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 		_g_object_unref0 (_tmp0_);
-#line 337 "ImportQueueSidebarEntry.c"
+#line 373 "ImportQueueSidebarEntry.c"
 	}
 #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	result = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	return result;
-#line 343 "ImportQueueSidebarEntry.c"
+#line 379 "ImportQueueSidebarEntry.c"
 }
 
 
-static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self) {
+static void
+_library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_added (ImportQueuePage* _sender,
+                                                                                             BatchImport* batch_import,
+                                                                                             gpointer self)
+{
 #line 36 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	library_import_queue_sidebar_entry_on_batch_added_or_removed ((LibraryImportQueueSidebarEntry*) self);
-#line 350 "ImportQueueSidebarEntry.c"
+#line 390 "ImportQueueSidebarEntry.c"
 }
 
 
-static void _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender, BatchImport* batch_import, gpointer self) {
+static void
+_library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed (ImportQueuePage* _sender,
+                                                                                               BatchImport* batch_import,
+                                                                                               gpointer self)
+{
 #line 37 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	library_import_queue_sidebar_entry_on_batch_added_or_removed ((LibraryImportQueueSidebarEntry*) self);
-#line 357 "ImportQueueSidebarEntry.c"
+#line 401 "ImportQueueSidebarEntry.c"
 }
 
 
-static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self) {
+static void
+library_import_queue_sidebar_entry_on_page_created (LibraryImportQueueSidebarEntry* self)
+{
 	ImportQueuePage* _tmp0_;
 	ImportQueuePage* _tmp1_;
 	ImportQueuePage* _tmp2_;
@@ -380,11 +426,13 @@ static void library_import_queue_sidebar_entry_on_page_created (LibraryImportQue
 	g_signal_connect_object (_tmp3_, "batch-removed", (GCallback) _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed, self, 0);
 #line 37 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	_g_object_unref0 (_tmp3_);
-#line 384 "ImportQueueSidebarEntry.c"
+#line 430 "ImportQueueSidebarEntry.c"
 }
 
 
-static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self) {
+static void
+library_import_queue_sidebar_entry_on_destroying_page (LibraryImportQueueSidebarEntry* self)
+{
 	ImportQueuePage* _tmp0_;
 	ImportQueuePage* _tmp1_;
 	guint _tmp2_;
@@ -413,14 +461,15 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_import_queue_sidebar_entry_on_batch_added_or_removed_import_queue_page_batch_removed, self);
 #line 42 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	_g_object_unref0 (_tmp4_);
-#line 417 "ImportQueueSidebarEntry.c"
+#line 465 "ImportQueueSidebarEntry.c"
 }
 
 
-static void library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self) {
+static void
+library_import_queue_sidebar_entry_on_batch_added_or_removed (LibraryImportQueueSidebarEntry* self)
+{
 	ImportQueuePage* _tmp0_;
 	ImportQueuePage* _tmp1_;
-	gint _tmp2_;
 #line 45 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
 #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -428,20 +477,20 @@ static void library_import_queue_sidebar_entry_on_batch_added_or_removed (Librar
 #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	_tmp1_ = _tmp0_;
 #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	_tmp2_ = import_queue_page_get_batch_count (_tmp1_);
-#line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp2_ > 0);
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), import_queue_page_get_batch_count (_tmp1_) > 0);
 #line 46 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	_g_object_unref0 (_tmp1_);
-#line 437 "ImportQueueSidebarEntry.c"
+#line 484 "ImportQueueSidebarEntry.c"
 }
 
 
-void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel) {
+void
+library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self,
+                                                         BatchImport* batch_import,
+                                                         gboolean allow_user_cancel)
+{
 	ImportQueuePage* _tmp0_;
 	ImportQueuePage* _tmp1_;
-	BatchImport* _tmp2_;
-	gboolean _tmp3_;
 #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_IMPORT_QUEUE_SIDEBAR_ENTRY (self));
 #line 49 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -453,18 +502,16 @@ void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueue
 #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	_tmp1_ = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	_tmp2_ = batch_import;
-#line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	_tmp3_ = allow_user_cancel;
-#line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
-	import_queue_page_enqueue_and_schedule (_tmp1_, _tmp2_, _tmp3_);
+	import_queue_page_enqueue_and_schedule (_tmp1_, batch_import, allow_user_cancel);
 #line 53 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	_g_object_unref0 (_tmp1_);
-#line 464 "ImportQueueSidebarEntry.c"
+#line 509 "ImportQueueSidebarEntry.c"
 }
 
 
-static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSidebarEntryClass * klass) {
+static void
+library_import_queue_sidebar_entry_class_init (LibraryImportQueueSidebarEntryClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	library_import_queue_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
@@ -473,15 +520,19 @@ static void library_import_queue_sidebar_entry_class_init (LibraryImportQueueSid
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_get_sidebar_icon;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueueSidebarEntry.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_import_queue_sidebar_entry_real_create_page;
-#line 477 "ImportQueueSidebarEntry.c"
+#line 524 "ImportQueueSidebarEntry.c"
 }
 
 
-static void library_import_queue_sidebar_entry_instance_init (LibraryImportQueueSidebarEntry * self) {
+static void
+library_import_queue_sidebar_entry_instance_init (LibraryImportQueueSidebarEntry * self)
+{
 }
 
 
-GType library_import_queue_sidebar_entry_get_type (void) {
+GType
+library_import_queue_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_import_queue_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_import_queue_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryImportQueueSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_import_queue_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryImportQueueSidebarEntry), 0, (GInstanceInitFunc) library_import_queue_sidebar_entry_instance_init, NULL };
diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index fae86fe..6fdba61 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -1,4 +1,4 @@
-/* LastImportPage.c generated by valac 0.36.6, the Vala compiler
+/* LastImportPage.c generated by valac 0.40.4, the Vala compiler
  * generated from LastImportPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -214,6 +215,11 @@ typedef struct _ImportID ImportID;
 
 typedef struct _Alteration Alteration;
 typedef struct _AlterationClass AlterationClass;
+enum  {
+	LAST_IMPORT_PAGE_0_PROPERTY,
+	LAST_IMPORT_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* last_import_page_properties[LAST_IMPORT_PAGE_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -582,9 +588,15 @@ 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 checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -598,17 +610,29 @@ 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;
@@ -623,20 +647,29 @@ ImportID* import_id_dup (const ImportID* self);
 void import_id_free (ImportID* 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;
 #define LAST_IMPORT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LAST_IMPORT_PAGE, LastImportPagePrivate))
-enum  {
-	LAST_IMPORT_PAGE_DUMMY_PROPERTY
-};
 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;
@@ -644,23 +677,35 @@ 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);
 GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
 static void last_import_page_on_import_rolls_altered (LastImportPage* self);
-static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self);
+static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender,
+                                                                                            gpointer self);
 #define IMPORT_ID_INVALID ((gint64) 0)
-void import_id_init (ImportID *self, gint64 id);
-Alteration* alteration_new (const gchar* subject, const gchar* detail);
-Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail);
+void import_id_init (ImportID *self,
+                     gint64 id);
+Alteration* alteration_new (const gchar* subject,
+                            const gchar* detail);
+Alteration* alteration_construct (GType object_type,
+                                  const gchar* subject,
+                                  const gchar* detail);
 #define LAST_IMPORT_PAGE_NAME _ ("Last Import")
 LastImportPage* last_import_page_new (void);
 LastImportPage* last_import_page_construct (GType object_type);
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
+CollectionPage* collection_page_construct (GType object_type,
+                                           const gchar* page_name);
 ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self);
 GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
@@ -668,56 +713,90 @@ void view_collection_halt_all_monitoring (ViewCollection* self);
 void data_collection_clear (DataCollection* self);
 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;
 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);
-static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id);
-static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+                                                                  SourceCollection* sources,
+                                                                  ViewManager* manager,
+                                                                  Alteration* prereq,
+                                                                  GeeCollection* initial,
+                                                                  ProgressMonitor progress_monitor,
+                                                                  void* progress_monitor_target);
+static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner,
+                                                                                    ImportID* import_id);
+static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type,
+                                                                                          LastImportPage* owner,
+                                                                                          ImportID* import_id);
 GType collection_view_manager_get_type (void) G_GNUC_CONST;
 static GType last_import_page_last_import_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static void last_import_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by);
+static void last_import_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 last_import_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);
+void configuration_facade_get_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean* sort_order,
+                                                   gint* sort_by);
+static void last_import_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);
 #define LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManagerPrivate))
-enum  {
-	LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_DUMMY_PROPERTY
-};
 CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
-static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+                                                          CollectionPage* page);
+static gboolean last_import_page_last_import_view_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;
-void media_source_get_import_id (MediaSource* self, ImportID* result);
+void media_source_get_import_id (MediaSource* self,
+                                 ImportID* result);
 static void last_import_page_last_import_view_manager_finalize (ViewManager * obj);
 static void last_import_page_finalize (GObject * obj);
 
 
-static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
+static void
+_last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender,
+                                                                                       gpointer self)
+{
 #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_on_import_rolls_altered ((LastImportPage*) self);
-#line 713 "LastImportPage.c"
+#line 790 "LastImportPage.c"
 }
 
 
-LastImportPage* last_import_page_construct (GType object_type) {
+LastImportPage*
+last_import_page_construct (GType object_type)
+{
 	LastImportPage * self = NULL;
 #line 28 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = (LastImportPage*) collection_page_construct (object_type, LAST_IMPORT_PAGE_NAME);
-#line 721 "LastImportPage.c"
+#line 800 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -746,57 +825,58 @@ LastImportPage* last_import_page_construct (GType object_type) {
 		_col_it = _tmp5_;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 750 "LastImportPage.c"
+#line 829 "LastImportPage.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* col = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp6_ = _col_it;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 765 "LastImportPage.c"
+#line 841 "LastImportPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp8_ = _col_it;
+			_tmp7_ = _col_it;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			col = (MediaSourceCollection*) _tmp9_;
+			col = (MediaSourceCollection*) _tmp8_;
 #line 32 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp10_ = col;
+			_tmp9_ = col;
 #line 32 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 779 "LastImportPage.c"
+#line 855 "LastImportPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 783 "LastImportPage.c"
+#line 859 "LastImportPage.c"
 	}
 #line 36 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_on_import_rolls_altered (self);
 #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return self;
-#line 789 "LastImportPage.c"
+#line 865 "LastImportPage.c"
 }
 
 
-LastImportPage* last_import_page_new (void) {
+LastImportPage*
+last_import_page_new (void)
+{
 #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return last_import_page_construct (TYPE_LAST_IMPORT_PAGE);
-#line 796 "LastImportPage.c"
+#line 874 "LastImportPage.c"
 }
 
 
-static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
+static void
+last_import_page_on_import_rolls_altered (LastImportPage* self)
+{
 	ImportID* current_last_import_id = NULL;
 	MediaCollectionRegistry* _tmp0_;
 	MediaCollectionRegistry* _tmp1_;
@@ -830,7 +910,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 	_tmp4_ = current_last_import_id;
 #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	if (_tmp4_ == NULL) {
-#line 834 "LastImportPage.c"
+#line 914 "LastImportPage.c"
 		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
 		ViewCollection* _tmp7_;
@@ -855,7 +935,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_import_id_free0 (current_last_import_id);
 #line 54 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		return;
-#line 859 "LastImportPage.c"
+#line 939 "LastImportPage.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp9_ = current_last_import_id;
@@ -871,7 +951,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_import_id_free0 (current_last_import_id);
 #line 58 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		return;
-#line 875 "LastImportPage.c"
+#line 955 "LastImportPage.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp13_ = current_last_import_id;
@@ -893,7 +973,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
 #line 63 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_data_collection_unref0 (_tmp17_);
-#line 897 "LastImportPage.c"
+#line 977 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp18_;
@@ -922,76 +1002,77 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_col_it = _tmp23_;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 926 "LastImportPage.c"
+#line 1006 "LastImportPage.c"
 			GeeIterator* _tmp24_;
-			gboolean _tmp25_;
 			MediaSourceCollection* col = NULL;
-			GeeIterator* _tmp26_;
-			gpointer _tmp27_;
+			GeeIterator* _tmp25_;
+			gpointer _tmp26_;
+			ViewCollection* _tmp27_;
 			ViewCollection* _tmp28_;
-			ViewCollection* _tmp29_;
-			MediaSourceCollection* _tmp30_;
-			ImportID _tmp31_;
+			MediaSourceCollection* _tmp29_;
+			ImportID _tmp30_;
+			LastImportPageLastImportViewManager* _tmp31_;
 			LastImportPageLastImportViewManager* _tmp32_;
-			LastImportPageLastImportViewManager* _tmp33_;
-			Alteration* _tmp34_;
+			Alteration* _tmp33_;
+			ViewCollectionMonitor* _tmp34_;
 			ViewCollectionMonitor* _tmp35_;
-			ViewCollectionMonitor* _tmp36_;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp24_ = _col_it;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp25_ = gee_iterator_next (_tmp24_);
-#line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			if (!_tmp25_) {
+			if (!gee_iterator_next (_tmp24_)) {
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 949 "LastImportPage.c"
+#line 1026 "LastImportPage.c"
 			}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp26_ = _col_it;
+			_tmp25_ = _col_it;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp27_ = gee_iterator_get (_tmp26_);
+			_tmp26_ = gee_iterator_get (_tmp25_);
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			col = (MediaSourceCollection*) _tmp27_;
+			col = (MediaSourceCollection*) _tmp26_;
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp29_ = _tmp28_;
+			_tmp28_ = _tmp27_;
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp30_ = col;
+			_tmp29_ = col;
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp31_ = self->priv->last_import_id;
+			_tmp30_ = self->priv->last_import_id;
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp32_ = last_import_page_last_import_view_manager_new (self, &_tmp31_);
+			_tmp31_ = last_import_page_last_import_view_manager_new (self, &_tmp30_);
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp33_ = _tmp32_;
+			_tmp32_ = _tmp31_;
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp34_ = self->priv->last_import_alteration;
+			_tmp33_ = self->priv->last_import_alteration;
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp35_ = view_collection_monitor_source_collection (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_VIEW_MANAGER, ViewManager), _tmp34_, NULL, NULL, NULL);
+			_tmp34_ = view_collection_monitor_source_collection (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_VIEW_MANAGER, ViewManager), _tmp33_, NULL, NULL, NULL);
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp36_ = _tmp35_;
+			_tmp35_ = _tmp34_;
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_view_collection_monitor_unref0 (_tmp36_);
+			_view_collection_monitor_unref0 (_tmp35_);
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_view_manager_unref0 (_tmp33_);
+			_view_manager_unref0 (_tmp32_);
 #line 66 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_data_collection_unref0 (_tmp29_);
+			_data_collection_unref0 (_tmp28_);
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 983 "LastImportPage.c"
+#line 1060 "LastImportPage.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 987 "LastImportPage.c"
+#line 1064 "LastImportPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_import_id_free0 (current_last_import_id);
-#line 991 "LastImportPage.c"
+#line 1068 "LastImportPage.c"
 }
 
 
-static void last_import_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+last_import_page_real_get_config_photos_sort (MediaPage* base,
+                                              gboolean* sort_order,
+                                              gint* sort_by)
+{
 	LastImportPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -1017,23 +1098,25 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool
 	if (sort_order) {
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1021 "LastImportPage.c"
+#line 1102 "LastImportPage.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	if (sort_by) {
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1027 "LastImportPage.c"
+#line 1108 "LastImportPage.c"
 	}
 }
 
 
-static void last_import_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+last_import_page_real_set_config_photos_sort (MediaPage* base,
+                                              gboolean sort_order,
+                                              gint sort_by)
+{
 	LastImportPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LAST_IMPORT_PAGE, LastImportPage);
 #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1041,77 +1124,79 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool
 #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp1_ = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp2_ = sort_order;
-#line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp3_ = sort_by;
-#line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.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 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1052 "LastImportPage.c"
+#line 1131 "LastImportPage.c"
 }
 
 
-static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_construct (GType object_type, LastImportPage* owner, ImportID* import_id) {
+static LastImportPageLastImportViewManager*
+last_import_page_last_import_view_manager_construct (GType object_type,
+                                                     LastImportPage* owner,
+                                                     ImportID* import_id)
+{
 	LastImportPageLastImportViewManager* self = NULL;
-	LastImportPage* _tmp0_;
-	ImportID _tmp1_;
+	ImportID _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_return_val_if_fail (IS_LAST_IMPORT_PAGE (owner), NULL);
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_return_val_if_fail (import_id != NULL, NULL);
 #line 14 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp0_ = owner;
-#line 14 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	self = (LastImportPageLastImportViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
+	self = (LastImportPageLastImportViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp1_ = *import_id;
+	_tmp0_ = *import_id;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	self->priv->import_id = _tmp1_;
+	self->priv->import_id = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return self;
-#line 1074 "LastImportPage.c"
+#line 1154 "LastImportPage.c"
 }
 
 
-static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id) {
+static LastImportPageLastImportViewManager*
+last_import_page_last_import_view_manager_new (LastImportPage* owner,
+                                               ImportID* import_id)
+{
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return last_import_page_last_import_view_manager_construct (LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, owner, import_id);
-#line 1081 "LastImportPage.c"
+#line 1164 "LastImportPage.c"
 }
 
 
-static gboolean last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base, DataSource* source) {
+static gboolean
+last_import_page_last_import_view_manager_real_include_in_view (ViewManager* base,
+                                                                DataSource* source)
+{
 	LastImportPageLastImportViewManager * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_;
-	ImportID _tmp1_ = {0};
-	gint64 _tmp2_;
-	ImportID _tmp3_;
-	gint64 _tmp4_;
+	ImportID _tmp0_ = {0};
+	gint64 _tmp1_;
+	ImportID _tmp2_;
+	gint64 _tmp3_;
 #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager);
 #line 19 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp0_ = source;
+	media_source_get_import_id (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource), &_tmp0_);
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	media_source_get_import_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp1_);
+	_tmp1_ = _tmp0_.id;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp2_ = _tmp1_.id;
+	_tmp2_ = self->priv->import_id;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp3_ = self->priv->import_id;
+	_tmp3_ = _tmp2_.id;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	_tmp4_ = _tmp3_.id;
-#line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-	result = _tmp2_ == _tmp4_;
+	result = _tmp1_ == _tmp3_;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return result;
-#line 1111 "LastImportPage.c"
+#line 1194 "LastImportPage.c"
 }
 
 
-static void last_import_page_last_import_view_manager_class_init (LastImportPageLastImportViewManagerClass * klass) {
+static void
+last_import_page_last_import_view_manager_class_init (LastImportPageLastImportViewManagerClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_last_import_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1120,28 +1205,34 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage
 	g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate));
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) last_import_page_last_import_view_manager_real_include_in_view;
-#line 1124 "LastImportPage.c"
+#line 1209 "LastImportPage.c"
 }
 
 
-static void last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) {
+static void
+last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv = LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 1131 "LastImportPage.c"
+#line 1218 "LastImportPage.c"
 }
 
 
-static void last_import_page_last_import_view_manager_finalize (ViewManager * obj) {
+static void
+last_import_page_last_import_view_manager_finalize (ViewManager * obj)
+{
 	LastImportPageLastImportViewManager * self;
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager);
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	VIEW_MANAGER_CLASS (last_import_page_last_import_view_manager_parent_class)->finalize (obj);
-#line 1141 "LastImportPage.c"
+#line 1230 "LastImportPage.c"
 }
 
 
-static GType last_import_page_last_import_view_manager_get_type (void) {
+static GType
+last_import_page_last_import_view_manager_get_type (void)
+{
 	static volatile gsize last_import_page_last_import_view_manager_type_id__volatile = 0;
 	if (g_once_init_enter (&last_import_page_last_import_view_manager_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LastImportPageLastImportViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) last_import_page_last_import_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LastImportPageLastImportViewManager), 0, (GInstanceInitFunc) last_import_page_last_import_view_manager_instance_init, NULL };
@@ -1153,7 +1244,9 @@ static GType last_import_page_last_import_view_manager_get_type (void) {
 }
 
 
-static void last_import_page_class_init (LastImportPageClass * klass) {
+static void
+last_import_page_class_init (LastImportPageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
@@ -1164,11 +1257,13 @@ static void last_import_page_class_init (LastImportPageClass * klass) {
 	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) last_import_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize;
-#line 1168 "LastImportPage.c"
+#line 1261 "LastImportPage.c"
 }
 
 
-static void last_import_page_instance_init (LastImportPage * self) {
+static void
+last_import_page_instance_init (LastImportPage * self)
+{
 	Alteration* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv = LAST_IMPORT_PAGE_GET_PRIVATE (self);
@@ -1178,15 +1273,17 @@ static void last_import_page_instance_init (LastImportPage * self) {
 	_tmp0_ = alteration_new ("metadata", "import-id");
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv->last_import_alteration = _tmp0_;
-#line 1182 "LastImportPage.c"
+#line 1277 "LastImportPage.c"
 }
 
 
-static void last_import_page_finalize (GObject * obj) {
+static void
+last_import_page_finalize (GObject * obj)
+{
 	LastImportPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage);
-#line 1190 "LastImportPage.c"
+#line 1287 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -1215,53 +1312,52 @@ static void last_import_page_finalize (GObject * obj) {
 		_col_it = _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 1219 "LastImportPage.c"
+#line 1316 "LastImportPage.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* col = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			guint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
+			guint _tmp10_;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp6_ = _col_it;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 1235 "LastImportPage.c"
+#line 1329 "LastImportPage.c"
 			}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp8_ = _col_it;
+			_tmp7_ = _col_it;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			col = (MediaSourceCollection*) _tmp9_;
+			col = (MediaSourceCollection*) _tmp8_;
 #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			_tmp10_ = col;
+			_tmp9_ = col;
 #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self);
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 1251 "LastImportPage.c"
+#line 1345 "LastImportPage.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 1255 "LastImportPage.c"
+#line 1349 "LastImportPage.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_alteration_unref0 (self->priv->last_import_alteration);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (last_import_page_parent_class)->finalize (obj);
-#line 1261 "LastImportPage.c"
+#line 1355 "LastImportPage.c"
 }
 
 
-GType last_import_page_get_type (void) {
+GType
+last_import_page_get_type (void)
+{
 	static volatile gsize last_import_page_type_id__volatile = 0;
 	if (g_once_init_enter (&last_import_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LastImportPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) last_import_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LastImportPage), 0, (GInstanceInitFunc) last_import_page_instance_init, NULL };
diff --git a/src/library/LastImportSidebarEntry.c b/src/library/LastImportSidebarEntry.c
index 03684ca..8640578 100644
--- a/src/library/LastImportSidebarEntry.c
+++ b/src/library/LastImportSidebarEntry.c
@@ -1,4 +1,4 @@
-/* LastImportSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* LastImportSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from LastImportSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -101,6 +102,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
 typedef struct _LibraryLastImportSidebarEntry LibraryLastImportSidebarEntry;
 typedef struct _LibraryLastImportSidebarEntryClass LibraryLastImportSidebarEntryClass;
 typedef struct _LibraryLastImportSidebarEntryPrivate LibraryLastImportSidebarEntryPrivate;
+enum  {
+	LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_last_import_sidebar_entry_properties[LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -272,14 +278,17 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
 GType library_last_import_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_LAST_IMPORT_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 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;
@@ -287,15 +296,22 @@ 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);
 GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
 static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self);
-static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self);
+static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender,
+                                                                                                             gpointer self);
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void);
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type);
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
@@ -303,7 +319,8 @@ GType import_id_get_type (void) G_GNUC_CONST;
 ImportID* import_id_dup (const ImportID* self);
 void import_id_free (ImportID* self);
 ImportID* media_collection_registry_get_last_import_id (MediaCollectionRegistry* self);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 #define LAST_IMPORT_PAGE_NAME _ ("Last Import")
 static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -318,22 +335,27 @@ GType last_import_page_get_type (void) G_GNUC_CONST;
 static void library_last_import_sidebar_entry_finalize (GObject * obj);
 
 
-static void _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
+static void
+_library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender,
+                                                                                                        gpointer self)
+{
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	library_last_import_sidebar_entry_on_import_rolls_altered ((LibraryLastImportSidebarEntry*) self);
-#line 325 "LastImportSidebarEntry.c"
+#line 345 "LastImportSidebarEntry.c"
 }
 
 
-LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type) {
+LibraryLastImportSidebarEntry*
+library_last_import_sidebar_entry_construct (GType object_type)
+{
 	LibraryLastImportSidebarEntry * self = NULL;
+	MediaCollectionRegistry* _tmp10_;
 	MediaCollectionRegistry* _tmp11_;
-	MediaCollectionRegistry* _tmp12_;
+	ImportID* _tmp12_;
 	ImportID* _tmp13_;
-	ImportID* _tmp14_;
 #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = (LibraryLastImportSidebarEntry*) library_hideable_page_entry_construct (object_type);
-#line 337 "LastImportSidebarEntry.c"
+#line 359 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -362,69 +384,70 @@ LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GTyp
 		_media_sources_it = _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
-#line 366 "LastImportSidebarEntry.c"
+#line 388 "LastImportSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 				break;
-#line 381 "LastImportSidebarEntry.c"
+#line 400 "LastImportSidebarEntry.c"
 			}
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "import-roll-altered", (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 395 "LastImportSidebarEntry.c"
+#line 414 "LastImportSidebarEntry.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 399 "LastImportSidebarEntry.c"
+#line 418 "LastImportSidebarEntry.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp11_ = media_collection_registry_get_instance ();
+	_tmp10_ = media_collection_registry_get_instance ();
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp13_ = media_collection_registry_get_last_import_id (_tmp12_);
+	_tmp12_ = media_collection_registry_get_last_import_id (_tmp11_);
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp14_ != NULL);
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp13_ != NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_import_id_free0 (_tmp14_);
+	_import_id_free0 (_tmp13_);
 #line 12 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-	_media_collection_registry_unref0 (_tmp12_);
+	_media_collection_registry_unref0 (_tmp11_);
 #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return self;
-#line 417 "LastImportSidebarEntry.c"
+#line 436 "LastImportSidebarEntry.c"
 }
 
 
-LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void) {
+LibraryLastImportSidebarEntry*
+library_last_import_sidebar_entry_new (void)
+{
 #line 8 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return library_last_import_sidebar_entry_construct (LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY);
-#line 424 "LastImportSidebarEntry.c"
+#line 445 "LastImportSidebarEntry.c"
 }
 
 
-static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -436,11 +459,13 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_name (SidebarSi
 	result = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return result;
-#line 440 "LastImportSidebarEntry.c"
+#line 463 "LastImportSidebarEntry.c"
 }
 
 
-static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryLastImportSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -452,11 +477,13 @@ static gchar* library_last_import_sidebar_entry_real_get_sidebar_icon (SidebarSi
 	result = _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return result;
-#line 456 "LastImportSidebarEntry.c"
+#line 481 "LastImportSidebarEntry.c"
 }
 
 
-static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_last_import_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryLastImportSidebarEntry * self;
 	Page* result = NULL;
 	LastImportPage* _tmp0_;
@@ -470,11 +497,13 @@ static Page* library_last_import_sidebar_entry_real_create_page (SidebarSimplePa
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 29 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	return result;
-#line 474 "LastImportSidebarEntry.c"
+#line 501 "LastImportSidebarEntry.c"
 }
 
 
-static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self) {
+static void
+library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLastImportSidebarEntry* self)
+{
 	MediaCollectionRegistry* _tmp0_;
 	MediaCollectionRegistry* _tmp1_;
 	ImportID* _tmp2_;
@@ -495,11 +524,13 @@ static void library_last_import_sidebar_entry_on_import_rolls_altered (LibraryLa
 	_import_id_free0 (_tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	_media_collection_registry_unref0 (_tmp1_);
-#line 499 "LastImportSidebarEntry.c"
+#line 528 "LastImportSidebarEntry.c"
 }
 
 
-static void library_last_import_sidebar_entry_class_init (LibraryLastImportSidebarEntryClass * klass) {
+static void
+library_last_import_sidebar_entry_class_init (LibraryLastImportSidebarEntryClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	library_last_import_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
@@ -510,19 +541,23 @@ static void library_last_import_sidebar_entry_class_init (LibraryLastImportSideb
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_last_import_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_last_import_sidebar_entry_finalize;
-#line 514 "LastImportSidebarEntry.c"
+#line 545 "LastImportSidebarEntry.c"
 }
 
 
-static void library_last_import_sidebar_entry_instance_init (LibraryLastImportSidebarEntry * self) {
+static void
+library_last_import_sidebar_entry_instance_init (LibraryLastImportSidebarEntry * self)
+{
 }
 
 
-static void library_last_import_sidebar_entry_finalize (GObject * obj) {
+static void
+library_last_import_sidebar_entry_finalize (GObject * obj)
+{
 	LibraryLastImportSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, LibraryLastImportSidebarEntry);
-#line 526 "LastImportSidebarEntry.c"
+#line 561 "LastImportSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -551,51 +586,50 @@ static void library_last_import_sidebar_entry_finalize (GObject * obj) {
 		_media_sources_it = _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		while (TRUE) {
-#line 555 "LastImportSidebarEntry.c"
+#line 590 "LastImportSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			guint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
+			guint _tmp10_;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 				break;
-#line 571 "LastImportSidebarEntry.c"
+#line 603 "LastImportSidebarEntry.c"
 			}
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("import-roll-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 17 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_last_import_sidebar_entry_on_import_rolls_altered_media_source_collection_import_roll_altered, self);
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 587 "LastImportSidebarEntry.c"
+#line 619 "LastImportSidebarEntry.c"
 		}
 #line 16 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 591 "LastImportSidebarEntry.c"
+#line 623 "LastImportSidebarEntry.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportSidebarEntry.vala"
 	G_OBJECT_CLASS (library_last_import_sidebar_entry_parent_class)->finalize (obj);
-#line 595 "LastImportSidebarEntry.c"
+#line 627 "LastImportSidebarEntry.c"
 }
 
 
-GType library_last_import_sidebar_entry_get_type (void) {
+GType
+library_last_import_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_last_import_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_last_import_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryLastImportSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_last_import_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryLastImportSidebarEntry), 0, (GInstanceInitFunc) library_last_import_sidebar_entry_instance_init, NULL };
diff --git a/src/library/Library.c b/src/library/Library.c
index 460fc05..e81e681 100644
--- a/src/library/Library.c
+++ b/src/library/Library.c
@@ -1,4 +1,4 @@
-/* Library.c generated by valac 0.36.6, the Vala compiler
+/* Library.c generated by valac 0.40.4, the Vala compiler
  * generated from Library.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -21,7 +22,9 @@ void library_terminate (void);
 void library_trash_sidebar_entry_terminate (void);
 
 
-void library_init (GError** error) {
+void
+library_init (GError** error)
+{
 	gboolean _tmp0_;
 	gboolean _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/library/Library.vala"
@@ -32,14 +35,16 @@ void library_init (GError** error) {
 	_tmp1_ = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/Library.vala"
 	photo_set_develop_raw_photos_to_files (TRUE);
-#line 36 "Library.c"
+#line 39 "Library.c"
 }
 
 
-void library_terminate (void) {
+void
+library_terminate (void)
+{
 #line 15 "/home/jens/Source/shotwell/src/library/Library.vala"
 	library_trash_sidebar_entry_terminate ();
-#line 43 "Library.c"
+#line 48 "Library.c"
 }
 
 
diff --git a/src/library/LibraryBranch.c b/src/library/LibraryBranch.c
index 1cd27cb..d46cc91 100644
--- a/src/library/LibraryBranch.c
+++ b/src/library/LibraryBranch.c
@@ -1,4 +1,4 @@
-/* LibraryBranch.c generated by valac 0.36.6, the Vala compiler
+/* LibraryBranch.c generated by valac 0.40.4, the Vala compiler
  * generated from LibraryBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -119,6 +120,17 @@ typedef struct _LibraryOfflineSidebarEntryClass LibraryOfflineSidebarEntryClass;
 
 typedef struct _LibraryTrashSidebarEntry LibraryTrashSidebarEntry;
 typedef struct _LibraryTrashSidebarEntryClass LibraryTrashSidebarEntryClass;
+enum  {
+	LIBRARY_BRANCH_0_PROPERTY,
+	LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* library_branch_properties[LIBRARY_BRANCH_NUM_PROPERTIES];
 
 #define LIBRARY_BRANCH_TYPE_ENTRY_POSITION (library_branch_entry_position_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
@@ -198,6 +210,11 @@ typedef struct _SidebarContextable SidebarContextable;
 typedef struct _SidebarContextableIface SidebarContextableIface;
 typedef struct _SidebarSimplePageEntryPrivate SidebarSimplePageEntryPrivate;
 typedef struct _LibraryPhotosEntryPrivate LibraryPhotosEntryPrivate;
+enum  {
+	LIBRARY_PHOTOS_ENTRY_0_PROPERTY,
+	LIBRARY_PHOTOS_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_photos_entry_properties[LIBRARY_PHOTOS_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))
@@ -239,11 +256,17 @@ typedef struct _CollectionPageClass CollectionPageClass;
 typedef struct _LibraryMainPage LibraryMainPage;
 typedef struct _LibraryMainPageClass LibraryMainPageClass;
 typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
+enum  {
+	LIBRARY_HIDEABLE_PAGE_ENTRY_0_PROPERTY,
+	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY,
+	LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_hideable_page_entry_properties[LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_PROPERTIES];
 enum  {
 	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL,
-	LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL
+	LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_SIGNALS
 };
-static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL] = {0};
+static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_NUM_SIGNALS] = {0};
 typedef struct _PagePrivate PagePrivate;
 
 #define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -378,6 +401,11 @@ typedef struct _DataSource DataSource;
 typedef struct _DataSourceClass DataSourceClass;
 typedef struct _CollectionPagePrivate CollectionPagePrivate;
 typedef struct _LibraryMainPagePrivate LibraryMainPagePrivate;
+enum  {
+	LIBRARY_MAIN_PAGE_0_PROPERTY,
+	LIBRARY_MAIN_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* library_main_page_properties[LIBRARY_MAIN_PAGE_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -789,107 +817,150 @@ GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST;
 GType library_offline_sidebar_entry_get_type (void) G_GNUC_CONST;
 GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST;
 #define LIBRARY_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_BRANCH, LibraryBranchPrivate))
-enum  {
-	LIBRARY_BRANCH_DUMMY_PROPERTY,
-	LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY,
-	LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY
-};
 static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position"
 LibraryBranch* library_branch_new (void);
 LibraryBranch* library_branch_construct (GType object_type);
-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);
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 GType sidebar_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 library_branch_comparator (SidebarEntry* a, SidebarEntry* b);
-static gint _library_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 library_branch_comparator (SidebarEntry* a,
+                                SidebarEntry* b);
+static gint _library_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);
 LibraryPhotosEntry* library_photos_entry_new (void);
 LibraryPhotosEntry* library_photos_entry_construct (GType object_type);
-static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value);
+static void library_branch_set_photos_entry (LibraryBranch* self,
+                                      LibraryPhotosEntry* value);
 LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void);
 LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type);
-static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value);
+static void library_branch_set_trash_entry (LibraryBranch* self,
+                                     LibraryTrashSidebarEntry* value);
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_new (void);
 LibraryLastImportSidebarEntry* library_last_import_sidebar_entry_construct (GType object_type);
-static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value);
+static void library_branch_set_last_imported_entry (LibraryBranch* self,
+                                             LibraryLastImportSidebarEntry* value);
 LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void);
 LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type);
-static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value);
+static void library_branch_set_flagged_entry (LibraryBranch* self,
+                                       LibraryFlaggedSidebarEntry* value);
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void);
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type);
-static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value);
+static void library_branch_set_offline_entry (LibraryBranch* self,
+                                       LibraryOfflineSidebarEntry* value);
 LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_new (void);
 LibraryImportQueueSidebarEntry* library_import_queue_sidebar_entry_construct (GType object_type);
-static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value);
-static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position);
+static void library_branch_set_import_queue_entry (LibraryBranch* self,
+                                            LibraryImportQueueSidebarEntry* value);
+static void library_branch_insert (LibraryBranch* self,
+                            SidebarEntry* entry,
+                            gint position);
 LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self);
 LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self);
 LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self);
 static void library_branch_on_flagged_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
+static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                                   gboolean visible,
+                                                                                                   gpointer self);
 LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self);
 static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
+static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                                         gboolean visible,
+                                                                                                         gpointer self);
 LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self);
 static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
+static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                                        gboolean visible,
+                                                                                                        gpointer self);
 LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self);
 static void library_branch_on_offline_visibility_changed (LibraryBranch* self);
-static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
+static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                                   gboolean visible,
+                                                                                                   gpointer self);
+void sidebar_branch_graft (SidebarBranch* self,
+                           SidebarEntry* parent,
+                           SidebarEntry* entry,
+                           GCompareFunc comparator);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
-static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position);
+static void library_branch_update_entry_visibility (LibraryBranch* self,
+                                             LibraryHideablePageEntry* entry,
+                                             gint position);
 gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self);
-gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
+gboolean sidebar_branch_has_entry (SidebarBranch* self,
+                                   SidebarEntry* entry);
+void sidebar_branch_prune (SidebarBranch* self,
+                           SidebarEntry* entry);
 static void library_branch_finalize (GObject * obj);
-static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_library_branch_get_property (GObject * object,
+                                        guint property_id,
+                                        GValue * value,
+                                        GParamSpec * pspec);
+static void _vala_library_branch_set_property (GObject * object,
+                                        guint property_id,
+                                        const GValue * value,
+                                        GParamSpec * pspec);
 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_contextable_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_PHOTOS_ENTRY_DUMMY_PROPERTY
-};
 SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
 static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
 #define RESOURCES_ICON_PHOTOS "shotwell"
 static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base);
-LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target);
-LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target);
+LibraryMainPage* library_main_page_new (ProgressMonitor monitor,
+                                        void* monitor_target);
+LibraryMainPage* library_main_page_construct (GType object_type,
+                                              ProgressMonitor monitor,
+                                              void* monitor_target);
 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 library_main_page_get_type (void) G_GNUC_CONST;
 #define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryPrivate))
-enum  {
-	LIBRARY_HIDEABLE_PAGE_ENTRY_DUMMY_PROPERTY,
-	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY
-};
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 static void library_hideable_page_entry_finalize (GObject * obj);
-static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+static void _vala_library_hideable_page_entry_get_property (GObject * object,
+                                                     guint property_id,
+                                                     GValue * value,
+                                                     GParamSpec * pspec);
+static void _vala_library_hideable_page_entry_set_property (GObject * object,
+                                                     guint property_id,
+                                                     const GValue * value,
+                                                     GParamSpec * pspec);
 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 data_object_get_type (void) G_GNUC_CONST;
@@ -902,33 +973,49 @@ 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;
 GType data_source_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_MAIN_PAGE_DUMMY_PROPERTY
-};
 #define LIBRARY_MAIN_PAGE_NAME _ ("Library")
-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;
@@ -936,9 +1023,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);
@@ -947,39 +1040,74 @@ GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 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;
 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);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+                                                                  SourceCollection* sources,
+                                                                  ViewManager* manager,
+                                                                  Alteration* prereq,
+                                                                  GeeCollection* initial,
+                                                                  ProgressMonitor progress_monitor,
+                                                                  void* progress_monitor_target);
 CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+                                                          CollectionPage* page);
 GType collection_view_manager_get_type (void) G_GNUC_CONST;
-static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by);
+static void library_main_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 library_main_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 GType library_branch_entry_position_get_type (void) {
+void configuration_facade_get_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean* sort_order,
+                                                   gint* sort_by);
+static void library_main_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 GType
+library_branch_entry_position_get_type (void)
+{
 	static volatile gsize library_branch_entry_position_type_id__volatile = 0;
 	if (g_once_init_enter (&library_branch_entry_position_type_id__volatile)) {
 		static const GEnumValue values[] = {{LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS, "LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS", "photos"}, {LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED, "LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED", "flagged"}, {LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED, "LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED", "last-imported"}, {LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE, "LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE", "import-queue"}, {LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE, "LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE", "offline"}, {LIBRARY_BRANCH_ENTRY_POSITION_TRASH, "LIBRARY_BRANCH_ENTRY_POSITION_TRASH", "trash"}, {0, NULL, NULL}};
@@ -991,44 +1119,65 @@ static GType library_branch_entry_position_get_type (void) {
 }
 
 
-static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpointer b) {
+static gint
+_library_branch_comparator_gcompare_func (gconstpointer a,
+                                          gconstpointer b)
+{
 	gint result;
 	result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1000 "LibraryBranch.c"
+#line 1131 "LibraryBranch.c"
 }
 
 
-static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+static void
+_library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                              gboolean visible,
+                                                                                              gpointer self)
+{
 #line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
-#line 1007 "LibraryBranch.c"
+#line 1142 "LibraryBranch.c"
 }
 
 
-static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+static void
+_library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                                    gboolean visible,
+                                                                                                    gpointer self)
+{
 #line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
-#line 1014 "LibraryBranch.c"
+#line 1153 "LibraryBranch.c"
 }
 
 
-static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+static void
+_library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                                   gboolean visible,
+                                                                                                   gpointer self)
+{
 #line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
-#line 1021 "LibraryBranch.c"
+#line 1164 "LibraryBranch.c"
 }
 
 
-static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
+static void
+_library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender,
+                                                                                              gboolean visible,
+                                                                                              gpointer self)
+{
 #line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
-#line 1028 "LibraryBranch.c"
+#line 1175 "LibraryBranch.c"
 }
 
 
-LibraryBranch* library_branch_construct (GType object_type) {
+LibraryBranch*
+library_branch_construct (GType object_type)
+{
 	LibraryBranch * self = NULL;
 	SidebarHeader* _tmp0_;
 	SidebarHeader* _tmp1_;
@@ -1140,48 +1289,47 @@ LibraryBranch* library_branch_construct (GType object_type) {
 	library_branch_on_offline_visibility_changed (self);
 #line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1144 "LibraryBranch.c"
+#line 1293 "LibraryBranch.c"
 }
 
 
-LibraryBranch* library_branch_new (void) {
+LibraryBranch*
+library_branch_new (void)
+{
 #line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_branch_construct (LIBRARY_TYPE_BRANCH);
-#line 1151 "LibraryBranch.c"
+#line 1302 "LibraryBranch.c"
 }
 
 
-static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position) {
+static void
+library_branch_insert (LibraryBranch* self,
+                       SidebarEntry* entry,
+                       gint position)
+{
 	SidebarEntry* _tmp0_;
-	gint _tmp1_;
-	SidebarEntry* _tmp2_;
-	SidebarEntry* _tmp3_;
-	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 56 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp0_ = entry;
-#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp1_ = position;
-#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_set_data_full (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA, (gpointer) ((gintptr) _tmp1_), NULL);
-#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp2_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+	g_object_set_data_full (G_TYPE_CHECK_INSTANCE_CAST (entry, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA, (gpointer) ((gintptr) position), NULL);
 #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp3_ = _tmp2_;
+	_tmp0_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
 #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp4_ = entry;
+	_tmp1_ = _tmp0_;
 #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL);
+	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp1_, entry, NULL);
 #line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1181 "LibraryBranch.c"
+	_g_object_unref0 (_tmp1_);
+#line 1327 "LibraryBranch.c"
 }
 
 
-static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
+static void
+library_branch_on_flagged_visibility_changed (LibraryBranch* self)
+{
 	LibraryFlaggedSidebarEntry* _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
@@ -1189,11 +1337,13 @@ static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
 	_tmp0_ = self->priv->_flagged_entry;
 #line 62 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED);
-#line 1193 "LibraryBranch.c"
+#line 1341 "LibraryBranch.c"
 }
 
 
-static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) {
+static void
+library_branch_on_last_imported_visibility_changed (LibraryBranch* self)
+{
 	LibraryLastImportSidebarEntry* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
@@ -1201,11 +1351,13 @@ static void library_branch_on_last_imported_visibility_changed (LibraryBranch* s
 	_tmp0_ = self->priv->_last_imported_entry;
 #line 66 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED);
-#line 1205 "LibraryBranch.c"
+#line 1355 "LibraryBranch.c"
 }
 
 
-static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) {
+static void
+library_branch_on_import_queue_visibility_changed (LibraryBranch* self)
+{
 	LibraryImportQueueSidebarEntry* _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
@@ -1213,11 +1365,13 @@ static void library_branch_on_import_queue_visibility_changed (LibraryBranch* se
 	_tmp0_ = self->priv->_import_queue_entry;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE);
-#line 1217 "LibraryBranch.c"
+#line 1369 "LibraryBranch.c"
 }
 
 
-static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
+static void
+library_branch_on_offline_visibility_changed (LibraryBranch* self)
+{
 	LibraryOfflineSidebarEntry* _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
@@ -1225,94 +1379,70 @@ static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
 	_tmp0_ = self->priv->_offline_entry;
 #line 74 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE);
-#line 1229 "LibraryBranch.c"
+#line 1383 "LibraryBranch.c"
 }
 
 
-static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position) {
-	LibraryHideablePageEntry* _tmp0_;
+static void
+library_branch_update_entry_visibility (LibraryBranch* self,
+                                        LibraryHideablePageEntry* entry,
+                                        gint position)
+{
+	gboolean _tmp0_;
 	gboolean _tmp1_;
-	gboolean _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 77 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (entry));
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp0_ = entry;
-#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp1_ = library_hideable_page_entry_get_visible (_tmp0_);
+	_tmp0_ = library_hideable_page_entry_get_visible (entry);
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	if (_tmp2_) {
-#line 1249 "LibraryBranch.c"
-		LibraryHideablePageEntry* _tmp3_;
-		gboolean _tmp4_;
-#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp3_ = entry;
-#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+	if (_tmp1_) {
 #line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		if (!_tmp4_) {
-#line 1258 "LibraryBranch.c"
-			LibraryHideablePageEntry* _tmp5_;
-			gint _tmp6_;
-#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp5_ = entry;
-#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp6_ = position;
+		if (!sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry))) {
 #line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_);
-#line 1267 "LibraryBranch.c"
+			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry), position);
+#line 1408 "LibraryBranch.c"
 		}
 	} else {
-		LibraryHideablePageEntry* _tmp7_;
-		gboolean _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp7_ = entry;
-#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		if (_tmp8_) {
-#line 1278 "LibraryBranch.c"
-			LibraryHideablePageEntry* _tmp9_;
-#line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp9_ = entry;
+		if (sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry))) {
 #line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1284 "LibraryBranch.c"
+			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 1415 "LibraryBranch.c"
 		}
 	}
 }
 
 
-static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
+static gint
+library_branch_comparator (SidebarEntry* a,
+                           SidebarEntry* b)
+{
 	gint result = 0;
-	SidebarEntry* _tmp0_;
+	gconstpointer _tmp0_;
 	gconstpointer _tmp1_;
-	SidebarEntry* _tmp2_;
-	gconstpointer _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 86 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
 #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp0_ = a;
-#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp1_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
+	_tmp0_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (a, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
 #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp2_ = b;
+	_tmp1_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (b, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
 #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp3_ = g_object_get_data (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, G_TYPE_OBJECT, GObject), LIBRARY_BRANCH_POSITION_DATA);
-#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_));
+	result = ((gint) ((gintptr) _tmp0_)) - ((gint) ((gintptr) _tmp1_));
 #line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1312 "LibraryBranch.c"
+#line 1440 "LibraryBranch.c"
 }
 
 
-LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
+LibraryPhotosEntry*
+library_branch_get_photos_entry (LibraryBranch* self)
+{
 	LibraryPhotosEntry* result;
 	LibraryPhotosEntry* _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1323,41 +1453,45 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1327 "LibraryBranch.c"
+#line 1457 "LibraryBranch.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1334 "LibraryBranch.c"
+#line 1466 "LibraryBranch.c"
 }
 
 
-static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) {
+static void
+library_branch_set_photos_entry (LibraryBranch* self,
+                                 LibraryPhotosEntry* value)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_photos_entry (self) != value) {
-#line 1343 "LibraryBranch.c"
+#line 1478 "LibraryBranch.c"
 		LibraryPhotosEntry* _tmp0_;
-		LibraryPhotosEntry* _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp0_ = value;
-#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_photos_entry);
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		self->priv->_photos_entry = _tmp1_;
+		self->priv->_photos_entry = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		g_object_notify ((GObject *) self, "photos-entry");
-#line 1356 "LibraryBranch.c"
+		g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY]);
+#line 1488 "LibraryBranch.c"
 	}
 }
 
 
-LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) {
+LibraryFlaggedSidebarEntry*
+library_branch_get_flagged_entry (LibraryBranch* self)
+{
 	LibraryFlaggedSidebarEntry* result;
 	LibraryFlaggedSidebarEntry* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1368,34 +1502,36 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1372 "LibraryBranch.c"
+#line 1506 "LibraryBranch.c"
 }
 
 
-static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) {
+static void
+library_branch_set_flagged_entry (LibraryBranch* self,
+                                  LibraryFlaggedSidebarEntry* value)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_flagged_entry (self) != value) {
-#line 1381 "LibraryBranch.c"
+#line 1518 "LibraryBranch.c"
 		LibraryFlaggedSidebarEntry* _tmp0_;
-		LibraryFlaggedSidebarEntry* _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp0_ = value;
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_flagged_entry);
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		self->priv->_flagged_entry = _tmp1_;
+		self->priv->_flagged_entry = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		g_object_notify ((GObject *) self, "flagged-entry");
-#line 1394 "LibraryBranch.c"
+		g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY]);
+#line 1528 "LibraryBranch.c"
 	}
 }
 
 
-LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) {
+LibraryLastImportSidebarEntry*
+library_branch_get_last_imported_entry (LibraryBranch* self)
+{
 	LibraryLastImportSidebarEntry* result;
 	LibraryLastImportSidebarEntry* _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1406,34 +1542,36 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr
 	result = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1410 "LibraryBranch.c"
+#line 1546 "LibraryBranch.c"
 }
 
 
-static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) {
+static void
+library_branch_set_last_imported_entry (LibraryBranch* self,
+                                        LibraryLastImportSidebarEntry* value)
+{
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_last_imported_entry (self) != value) {
-#line 1419 "LibraryBranch.c"
+#line 1558 "LibraryBranch.c"
 		LibraryLastImportSidebarEntry* _tmp0_;
-		LibraryLastImportSidebarEntry* _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp0_ = value;
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_last_imported_entry);
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		self->priv->_last_imported_entry = _tmp1_;
+		self->priv->_last_imported_entry = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		g_object_notify ((GObject *) self, "last-imported-entry");
-#line 1432 "LibraryBranch.c"
+		g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY]);
+#line 1568 "LibraryBranch.c"
 	}
 }
 
 
-LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) {
+LibraryImportQueueSidebarEntry*
+library_branch_get_import_queue_entry (LibraryBranch* self)
+{
 	LibraryImportQueueSidebarEntry* result;
 	LibraryImportQueueSidebarEntry* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1444,34 +1582,36 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr
 	result = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1448 "LibraryBranch.c"
+#line 1586 "LibraryBranch.c"
 }
 
 
-static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) {
+static void
+library_branch_set_import_queue_entry (LibraryBranch* self,
+                                       LibraryImportQueueSidebarEntry* value)
+{
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_import_queue_entry (self) != value) {
-#line 1457 "LibraryBranch.c"
+#line 1598 "LibraryBranch.c"
 		LibraryImportQueueSidebarEntry* _tmp0_;
-		LibraryImportQueueSidebarEntry* _tmp1_;
-#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp0_ = value;
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_import_queue_entry);
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		self->priv->_import_queue_entry = _tmp1_;
+		self->priv->_import_queue_entry = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		g_object_notify ((GObject *) self, "import-queue-entry");
-#line 1470 "LibraryBranch.c"
+		g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY]);
+#line 1608 "LibraryBranch.c"
 	}
 }
 
 
-LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) {
+LibraryOfflineSidebarEntry*
+library_branch_get_offline_entry (LibraryBranch* self)
+{
 	LibraryOfflineSidebarEntry* result;
 	LibraryOfflineSidebarEntry* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1482,34 +1622,36 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1486 "LibraryBranch.c"
+#line 1626 "LibraryBranch.c"
 }
 
 
-static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) {
+static void
+library_branch_set_offline_entry (LibraryBranch* self,
+                                  LibraryOfflineSidebarEntry* value)
+{
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_offline_entry (self) != value) {
-#line 1495 "LibraryBranch.c"
+#line 1638 "LibraryBranch.c"
 		LibraryOfflineSidebarEntry* _tmp0_;
-		LibraryOfflineSidebarEntry* _tmp1_;
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp0_ = value;
-#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_offline_entry);
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		self->priv->_offline_entry = _tmp1_;
+		self->priv->_offline_entry = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		g_object_notify ((GObject *) self, "offline-entry");
-#line 1508 "LibraryBranch.c"
+		g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY]);
+#line 1648 "LibraryBranch.c"
 	}
 }
 
 
-LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
+LibraryTrashSidebarEntry*
+library_branch_get_trash_entry (LibraryBranch* self)
+{
 	LibraryTrashSidebarEntry* result;
 	LibraryTrashSidebarEntry* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1520,34 +1662,36 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1524 "LibraryBranch.c"
+#line 1666 "LibraryBranch.c"
 }
 
 
-static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) {
+static void
+library_branch_set_trash_entry (LibraryBranch* self,
+                                LibraryTrashSidebarEntry* value)
+{
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_trash_entry (self) != value) {
-#line 1533 "LibraryBranch.c"
+#line 1678 "LibraryBranch.c"
 		LibraryTrashSidebarEntry* _tmp0_;
-		LibraryTrashSidebarEntry* _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp0_ = value;
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = _g_object_ref0 (value);
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (self->priv->_trash_entry);
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		self->priv->_trash_entry = _tmp1_;
+		self->priv->_trash_entry = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-		g_object_notify ((GObject *) self, "trash-entry");
-#line 1546 "LibraryBranch.c"
+		g_object_notify_by_pspec ((GObject *) self, library_branch_properties[LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY]);
+#line 1688 "LibraryBranch.c"
 	}
 }
 
 
-static void library_branch_class_init (LibraryBranchClass * klass) {
+static void
+library_branch_class_init (LibraryBranchClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1559,29 +1703,33 @@ static void library_branch_class_init (LibraryBranchClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_branch_finalize;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY] = g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY] = g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY] = g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY] = g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY] = g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1574 "LibraryBranch.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, library_branch_properties[LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY] = g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
+#line 1718 "LibraryBranch.c"
 }
 
 
-static void library_branch_instance_init (LibraryBranch * self) {
+static void
+library_branch_instance_init (LibraryBranch * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
-#line 1581 "LibraryBranch.c"
+#line 1727 "LibraryBranch.c"
 }
 
 
-static void library_branch_finalize (GObject * obj) {
+static void
+library_branch_finalize (GObject * obj)
+{
 	LibraryBranch * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch);
@@ -1599,11 +1747,13 @@ static void library_branch_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->_trash_entry);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
-#line 1603 "LibraryBranch.c"
+#line 1751 "LibraryBranch.c"
 }
 
 
-GType library_branch_get_type (void) {
+GType
+library_branch_get_type (void)
+{
 	static volatile gsize library_branch_type_id__volatile = 0;
 	if (g_once_init_enter (&library_branch_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryBranch), 0, (GInstanceInitFunc) library_branch_instance_init, NULL };
@@ -1615,7 +1765,12 @@ GType library_branch_get_type (void) {
 }
 
 
-static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_library_branch_get_property (GObject * object,
+                                   guint property_id,
+                                   GValue * value,
+                                   GParamSpec * pspec)
+{
 	LibraryBranch * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1656,18 +1811,23 @@ static void _vala_library_branch_get_property (GObject * object, guint property_
 		g_value_set_object (value, library_branch_get_trash_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1660 "LibraryBranch.c"
+#line 1815 "LibraryBranch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1666 "LibraryBranch.c"
+#line 1821 "LibraryBranch.c"
 	}
 }
 
 
-static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_library_branch_set_property (GObject * object,
+                                   guint property_id,
+                                   const GValue * value,
+                                   GParamSpec * pspec)
+{
 	LibraryBranch * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_BRANCH, LibraryBranch);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1708,35 +1868,41 @@ static void _vala_library_branch_set_property (GObject * object, guint property_
 		library_branch_set_trash_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1712 "LibraryBranch.c"
+#line 1872 "LibraryBranch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1718 "LibraryBranch.c"
+#line 1878 "LibraryBranch.c"
 	}
 }
 
 
-LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
+LibraryPhotosEntry*
+library_photos_entry_construct (GType object_type)
+{
 	LibraryPhotosEntry * self = NULL;
 #line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1729 "LibraryBranch.c"
+#line 1891 "LibraryBranch.c"
 }
 
 
-LibraryPhotosEntry* library_photos_entry_new (void) {
+LibraryPhotosEntry*
+library_photos_entry_new (void)
+{
 #line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
-#line 1736 "LibraryBranch.c"
+#line 1900 "LibraryBranch.c"
 }
 
 
-static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -1748,11 +1914,13 @@ static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	result = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1752 "LibraryBranch.c"
+#line 1918 "LibraryBranch.c"
 }
 
 
-static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -1764,11 +1932,13 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1768 "LibraryBranch.c"
+#line 1936 "LibraryBranch.c"
 }
 
 
-static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_photos_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryPhotosEntry * self;
 	Page* result = NULL;
 	LibraryMainPage* _tmp0_;
@@ -1782,11 +1952,13 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1786 "LibraryBranch.c"
+#line 1956 "LibraryBranch.c"
 }
 
 
-static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
+static void
+library_photos_entry_class_init (LibraryPhotosEntryClass * klass)
+{
 #line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_photos_entry_parent_class = g_type_class_peek_parent (klass);
 #line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1795,15 +1967,19 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon;
 #line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page;
-#line 1799 "LibraryBranch.c"
+#line 1971 "LibraryBranch.c"
 }
 
 
-static void library_photos_entry_instance_init (LibraryPhotosEntry * self) {
+static void
+library_photos_entry_instance_init (LibraryPhotosEntry * self)
+{
 }
 
 
-GType library_photos_entry_get_type (void) {
+GType
+library_photos_entry_get_type (void)
+{
 	static volatile gsize library_photos_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_photos_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotosEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photos_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotosEntry), 0, (GInstanceInitFunc) library_photos_entry_instance_init, NULL };
@@ -1815,17 +1991,21 @@ GType library_photos_entry_get_type (void) {
 }
 
 
-LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type) {
+LibraryHideablePageEntry*
+library_hideable_page_entry_construct (GType object_type)
+{
 	LibraryHideablePageEntry * self = NULL;
 #line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1825 "LibraryBranch.c"
+#line 2003 "LibraryBranch.c"
 }
 
 
-gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) {
+gboolean
+library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self)
+{
 	gboolean result;
 	gboolean _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1836,42 +2016,38 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self
 	result = _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1840 "LibraryBranch.c"
+#line 2020 "LibraryBranch.c"
 }
 
 
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value) {
+void
+library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                         gboolean value)
+{
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self));
 #line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp0_ = value;
-#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp1_ = self->priv->show_entry;
+	_tmp0_ = self->priv->show_entry;
 #line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (value == _tmp0_) {
 #line 118 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		return;
-#line 1859 "LibraryBranch.c"
+#line 2037 "LibraryBranch.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp2_ = value;
-#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	self->priv->show_entry = _tmp2_;
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp3_ = value;
+	self->priv->show_entry = value;
 #line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
+	g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, value);
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_notify ((GObject *) self, "visible");
-#line 1871 "LibraryBranch.c"
+	g_object_notify_by_pspec ((GObject *) self, library_hideable_page_entry_properties[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY]);
+#line 2045 "LibraryBranch.c"
 }
 
 
-static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass) {
+static void
+library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass)
+{
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_hideable_page_entry_parent_class = g_type_class_peek_parent (klass);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1883,33 +2059,39 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize;
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, library_hideable_page_entry_properties[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY] = g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READABLE | G_PARAM_WRITABLE));
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL] = g_signal_new ("visibility-changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1890 "LibraryBranch.c"
+#line 2066 "LibraryBranch.c"
 }
 
 
-static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self) {
+static void
+library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self)
+{
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self);
 #line 113 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv->show_entry = FALSE;
-#line 1899 "LibraryBranch.c"
+#line 2077 "LibraryBranch.c"
 }
 
 
-static void library_hideable_page_entry_finalize (GObject * obj) {
+static void
+library_hideable_page_entry_finalize (GObject * obj)
+{
 	LibraryHideablePageEntry * self;
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
-#line 1909 "LibraryBranch.c"
+#line 2089 "LibraryBranch.c"
 }
 
 
-GType library_hideable_page_entry_get_type (void) {
+GType
+library_hideable_page_entry_get_type (void)
+{
 	static volatile gsize library_hideable_page_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_hideable_page_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryHideablePageEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_hideable_page_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryHideablePageEntry), 0, (GInstanceInitFunc) library_hideable_page_entry_instance_init, NULL };
@@ -1921,7 +2103,12 @@ GType library_hideable_page_entry_get_type (void) {
 }
 
 
-static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_library_hideable_page_entry_get_property (GObject * object,
+                                                guint property_id,
+                                                GValue * value,
+                                                GParamSpec * pspec)
+{
 	LibraryHideablePageEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1932,18 +2119,23 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu
 		g_value_set_boolean (value, library_hideable_page_entry_get_visible (self));
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1936 "LibraryBranch.c"
+#line 2123 "LibraryBranch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1942 "LibraryBranch.c"
+#line 2129 "LibraryBranch.c"
 	}
 }
 
 
-static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+static void
+_vala_library_hideable_page_entry_set_property (GObject * object,
+                                                guint property_id,
+                                                const GValue * value,
+                                                GParamSpec * pspec)
+{
 	LibraryHideablePageEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -1954,22 +2146,26 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu
 		library_hideable_page_entry_set_visible (self, g_value_get_boolean (value));
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1958 "LibraryBranch.c"
+#line 2150 "LibraryBranch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1964 "LibraryBranch.c"
+#line 2156 "LibraryBranch.c"
 	}
 }
 
 
-LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor monitor, void* monitor_target) {
+LibraryMainPage*
+library_main_page_construct (GType object_type,
+                             ProgressMonitor monitor,
+                             void* monitor_target)
+{
 	LibraryMainPage * self = NULL;
 #line 133 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
-#line 1973 "LibraryBranch.c"
+#line 2169 "LibraryBranch.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -1998,83 +2194,81 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 		_sources_it = _tmp5_;
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		while (TRUE) {
-#line 2002 "LibraryBranch.c"
+#line 2198 "LibraryBranch.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			ViewCollection* _tmp9_;
 			ViewCollection* _tmp10_;
-			ViewCollection* _tmp11_;
-			MediaSourceCollection* _tmp12_;
+			MediaSourceCollection* _tmp11_;
+			CollectionViewManager* _tmp12_;
 			CollectionViewManager* _tmp13_;
-			CollectionViewManager* _tmp14_;
-			ProgressMonitor _tmp15_;
-			void* _tmp15__target;
-			ViewCollectionMonitor* _tmp16_;
-			ViewCollectionMonitor* _tmp17_;
+			ViewCollectionMonitor* _tmp14_;
+			ViewCollectionMonitor* _tmp15_;
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp6_ = _sources_it;
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 				break;
-#line 2025 "LibraryBranch.c"
+#line 2216 "LibraryBranch.c"
 			}
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp8_ = _sources_it;
+			_tmp7_ = _sources_it;
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			sources = (MediaSourceCollection*) _tmp9_;
+			sources = (MediaSourceCollection*) _tmp8_;
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp11_ = _tmp10_;
+			_tmp10_ = _tmp9_;
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp12_ = sources;
+			_tmp11_ = sources;
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp13_ = collection_view_manager_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage));
+			_tmp12_ = collection_view_manager_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp14_ = _tmp13_;
+			_tmp13_ = _tmp12_;
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp15_ = monitor;
+			_tmp14_ = view_collection_monitor_source_collection (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, monitor, monitor_target);
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp15__target = monitor_target;
+			_tmp15_ = _tmp14_;
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp16_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, _tmp15_, _tmp15__target);
+			_view_collection_monitor_unref0 (_tmp15_);
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_tmp17_ = _tmp16_;
+			_view_manager_unref0 (_tmp13_);
 #line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_view_collection_monitor_unref0 (_tmp17_);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_view_manager_unref0 (_tmp14_);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-			_data_collection_unref0 (_tmp11_);
+			_data_collection_unref0 (_tmp10_);
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_data_collection_unref0 (sources);
-#line 2059 "LibraryBranch.c"
+#line 2246 "LibraryBranch.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (_sources_it);
-#line 2063 "LibraryBranch.c"
+#line 2250 "LibraryBranch.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 2067 "LibraryBranch.c"
+#line 2254 "LibraryBranch.c"
 }
 
 
-LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
+LibraryMainPage*
+library_main_page_new (ProgressMonitor monitor,
+                       void* monitor_target)
+{
 #line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
-#line 2074 "LibraryBranch.c"
+#line 2264 "LibraryBranch.c"
 }
 
 
-static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+library_main_page_real_get_config_photos_sort (MediaPage* base,
+                                               gboolean* sort_order,
+                                               gint* sort_by)
+{
 	LibraryMainPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -2100,23 +2294,25 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	if (sort_order) {
 #line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		*sort_order = _vala_sort_order;
-#line 2104 "LibraryBranch.c"
+#line 2298 "LibraryBranch.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (sort_by) {
 #line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		*sort_by = _vala_sort_by;
-#line 2110 "LibraryBranch.c"
+#line 2304 "LibraryBranch.c"
 	}
 }
 
 
-static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+library_main_page_real_set_config_photos_sort (MediaPage* base,
+                                               gboolean sort_order,
+                                               gint sort_by)
+{
 	LibraryMainPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
 #line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
@@ -2124,33 +2320,35 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo
 #line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp2_ = sort_order;
-#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
-	_tmp3_ = sort_by;
-#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.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 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2135 "LibraryBranch.c"
+#line 2327 "LibraryBranch.c"
 }
 
 
-static void library_main_page_class_init (LibraryMainPageClass * klass) {
+static void
+library_main_page_class_init (LibraryMainPageClass * klass)
+{
 #line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_main_page_parent_class = g_type_class_peek_parent (klass);
 #line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
 #line 129 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort;
-#line 2146 "LibraryBranch.c"
+#line 2340 "LibraryBranch.c"
 }
 
 
-static void library_main_page_instance_init (LibraryMainPage * self) {
+static void
+library_main_page_instance_init (LibraryMainPage * self)
+{
 }
 
 
-GType library_main_page_get_type (void) {
+GType
+library_main_page_get_type (void)
+{
 	static volatile gsize library_main_page_type_id__volatile = 0;
 	if (g_once_init_enter (&library_main_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryMainPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_main_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryMainPage), 0, (GInstanceInitFunc) library_main_page_instance_init, NULL };
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index bb92872..906dbab 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -1,4 +1,4 @@
-/* LibraryWindow.c generated by valac 0.36.6, the Vala compiler
+/* LibraryWindow.c generated by valac 0.40.4, the Vala compiler
  * generated from LibraryWindow.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -247,6 +248,11 @@ typedef struct _BasicPropertiesClass BasicPropertiesClass;
 
 typedef struct _ExtendedPropertiesWindow ExtendedPropertiesWindow;
 typedef struct _ExtendedPropertiesWindowClass ExtendedPropertiesWindowClass;
+enum  {
+	LIBRARY_WINDOW_0_PROPERTY,
+	LIBRARY_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* library_window_properties[LIBRARY_WINDOW_NUM_PROPERTIES];
 
 #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))
@@ -920,6 +926,11 @@ typedef struct _LibraryPhotoPagePrivate LibraryPhotoPagePrivate;
 
 #define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
 typedef struct _LibraryWindowFullscreenPhotoPagePrivate LibraryWindowFullscreenPhotoPagePrivate;
+enum  {
+	LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_0_PROPERTY,
+	LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* library_window_fullscreen_photo_page_properties[LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_NUM_PROPERTIES];
 #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; }
@@ -1224,9 +1235,15 @@ void dimensions_free (Dimensions* self);
 GType library_window_get_type (void) G_GNUC_CONST;
 gpointer one_shot_scheduler_ref (gpointer instance);
 void one_shot_scheduler_unref (gpointer instance);
-GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_one_shot_scheduler (GValue* value, gpointer v_object);
-void value_take_one_shot_scheduler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_one_shot_scheduler (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_one_shot_scheduler (GValue* value,
+                                   gpointer v_object);
+void value_take_one_shot_scheduler (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_one_shot_scheduler (const GValue* value);
 GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
@@ -1243,9 +1260,15 @@ GType editing_host_page_get_type (void) G_GNUC_CONST;
 GType library_photo_page_get_type (void) G_GNUC_CONST;
 gpointer search_filter_actions_ref (gpointer instance);
 void search_filter_actions_unref (gpointer instance);
-GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_search_filter_actions (GValue* value, gpointer v_object);
-void value_take_search_filter_actions (GValue* value, gpointer v_object);
+GParamSpec* param_spec_search_filter_actions (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags);
+void value_set_search_filter_actions (GValue* value,
+                                      gpointer v_object);
+void value_take_search_filter_actions (GValue* value,
+                                       gpointer v_object);
 gpointer value_get_search_filter_actions (const GValue* value);
 GType search_filter_actions_get_type (void) G_GNUC_CONST;
 GType search_filter_toolbar_get_type (void) G_GNUC_CONST;
@@ -1253,30 +1276,52 @@ GType properties_get_type (void) G_GNUC_CONST;
 GType basic_properties_get_type (void) G_GNUC_CONST;
 GType extended_properties_window_get_type (void) G_GNUC_CONST;
 #define LIBRARY_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_WINDOW, LibraryWindowPrivate))
-enum  {
-	LIBRARY_WINDOW_DUMMY_PROPERTY
-};
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType sidebar_page_representative_get_type (void) G_GNUC_CONST;
-static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page);
-static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self);
-static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page);
-static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self);
-static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable);
-static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self);
-static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable);
-static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self);
-static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page);
+static void library_window_on_page_created (LibraryWindow* self,
+                                     SidebarPageRepresentative* entry,
+                                     Page* page);
+static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender,
+                                                                SidebarPageRepresentative* entry,
+                                                                Page* page,
+                                                                gpointer self);
+static void library_window_on_destroying_page (LibraryWindow* self,
+                                        SidebarPageRepresentative* entry,
+                                        Page* page);
+static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender,
+                                                                      SidebarPageRepresentative* entry,
+                                                                      Page* page,
+                                                                      gpointer self);
+static void library_window_on_sidebar_entry_selected (LibraryWindow* self,
+                                               SidebarSelectableEntry* selectable);
+static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender,
+                                                                            SidebarSelectableEntry* selectable,
+                                                                            gpointer self);
+static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self,
+                                                       SidebarSelectableEntry* selectable);
+static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender,
+                                                                                            SidebarSelectableEntry* removed,
+                                                                                            gpointer self);
+static void library_window_unsubscribe_from_basic_information (LibraryWindow* self,
+                                                        Page* page);
 Page* page_window_get_current_page (PageWindow* self);
 static void library_window_hide_extended_properties (LibraryWindow* self);
-static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self);
+static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender,
+                                                               gpointer self);
 static void library_window_show_extended_properties (LibraryWindow* self);
-static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self);
+static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender,
+                                                               gpointer self);
 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;
@@ -1284,9 +1329,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);
@@ -1296,52 +1347,95 @@ GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
-static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                     GeeCollection* added,
+                                                                                                     GeeCollection* removed,
+                                                                                                     gpointer self);
 static void library_window_on_media_altered (LibraryWindow* 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;
-static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                     GeeMap* items,
+                                                                     gpointer self);
 GType metadata_writer_get_type (void) G_GNUC_CONST;
 MetadataWriter* metadata_writer_get_instance (void);
-static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total);
-static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self);
+static void library_window_on_metadata_writer_progress (LibraryWindow* self,
+                                                 guint completed,
+                                                 guint total);
+static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender,
+                                                                           guint completed,
+                                                                           guint total,
+                                                                           gpointer self);
 GType directory_monitor_get_type (void) G_GNUC_CONST;
 GType library_monitor_get_type (void) G_GNUC_CONST;
 gpointer library_monitor_pool_ref (gpointer instance);
 void library_monitor_pool_unref (gpointer instance);
-GParamSpec* param_spec_library_monitor_pool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_library_monitor_pool (GValue* value, gpointer v_object);
-void value_take_library_monitor_pool (GValue* value, gpointer v_object);
+GParamSpec* param_spec_library_monitor_pool (const gchar* name,
+                                             const gchar* nick,
+                                             const gchar* blurb,
+                                             GType object_type,
+                                             GParamFlags flags);
+void value_set_library_monitor_pool (GValue* value,
+                                     gpointer v_object);
+void value_take_library_monitor_pool (GValue* value,
+                                      gpointer v_object);
 gpointer value_get_library_monitor_pool (const GValue* value);
 GType library_monitor_pool_get_type (void) G_GNUC_CONST;
 LibraryMonitorPool* library_monitor_pool_get_instance (void);
 LibraryMonitor* library_monitor_pool_get_monitor (LibraryMonitorPool* self);
-static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor);
-static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor);
-static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self);
-static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self);
+static void library_window_on_library_monitor_destroyed (LibraryWindow* self,
+                                                  LibraryMonitor* monitor);
+static void library_window_on_library_monitor_installed (LibraryWindow* self,
+                                                  LibraryMonitor* monitor);
+static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender,
+                                                                                          LibraryMonitor* monitor,
+                                                                                          gpointer self);
+static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender,
+                                                                                          LibraryMonitor* monitor,
+                                                                                          gpointer self);
 gpointer camera_table_ref (gpointer instance);
 void camera_table_unref (gpointer instance);
-GParamSpec* param_spec_camera_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_camera_table (GValue* value, gpointer v_object);
-void value_take_camera_table (GValue* value, gpointer v_object);
+GParamSpec* param_spec_camera_table (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void value_set_camera_table (GValue* value,
+                             gpointer v_object);
+void value_take_camera_table (GValue* value,
+                              gpointer v_object);
 gpointer value_get_camera_table (const GValue* value);
 GType camera_table_get_type (void) G_GNUC_CONST;
 CameraTable* camera_table_get_instance (void);
 gpointer discovered_camera_ref (gpointer instance);
 void discovered_camera_unref (gpointer instance);
-GParamSpec* param_spec_discovered_camera (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_discovered_camera (GValue* value, gpointer v_object);
-void value_take_discovered_camera (GValue* value, gpointer v_object);
+GParamSpec* param_spec_discovered_camera (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_discovered_camera (GValue* value,
+                                  gpointer v_object);
+void value_take_discovered_camera (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_discovered_camera (const GValue* value);
 GType discovered_camera_get_type (void) G_GNUC_CONST;
-static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera);
-static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self);
+static void library_window_on_camera_added (LibraryWindow* self,
+                                     DiscoveredCamera* camera);
+static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+                                                                DiscoveredCamera* camera,
+                                                                gpointer self);
 static GType library_window_sidebar_root_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType library_window_target_type_get_type (void) G_GNUC_CONST;
 LibraryBranch* library_branch_new (void);
@@ -1372,73 +1466,168 @@ BasicProperties* basic_properties_construct (GType object_type);
 #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path"
 #define LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE "shotwell/media-id-atom"
 static void library_window_on_file_import (LibraryWindow* self);
-static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
 static void library_window_on_external_library_import (LibraryWindow* self);
-static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                                  GVariant* parameter,
+                                                                                  gpointer self);
 static void library_window_on_preferences (LibraryWindow* self);
-static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
 static void library_window_on_empty_trash (LibraryWindow* self);
-static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
 static void library_window_on_jump_to_event (LibraryWindow* self);
-static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
 static void library_window_on_find (LibraryWindow* self);
-static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self);
 static void library_window_on_new_search (LibraryWindow* self);
-static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value);
-static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant);
-static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant);
-static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value);
-static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value);
-static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
-LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target);
-LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target);
+static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                     GVariant* parameter,
+                                                                     gpointer self);
+static void library_window_on_action_toggle (LibraryWindow* self,
+                                      GAction* action,
+                                      GVariant* value);
+static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
+static void library_window_on_display_basic_properties (LibraryWindow* self,
+                                                 GSimpleAction* action,
+                                                 GVariant* value);
+static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                                       GVariant* value,
+                                                                                       gpointer self);
+static void library_window_on_display_extended_properties (LibraryWindow* self,
+                                                    GSimpleAction* action,
+                                                    GVariant* value);
+static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                                          GVariant* value,
+                                                                                          gpointer self);
+static void library_window_on_display_searchbar (LibraryWindow* self,
+                                          GSimpleAction* action,
+                                          GVariant* value);
+static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                                GVariant* value,
+                                                                                gpointer self);
+static void library_window_on_display_sidebar (LibraryWindow* self,
+                                        GSimpleAction* action,
+                                        GVariant* variant);
+static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                              GVariant* value,
+                                                                              gpointer self);
+static void library_window_on_display_toolbar (LibraryWindow* self,
+                                        GSimpleAction* action,
+                                        GVariant* variant);
+static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                              GVariant* value,
+                                                                              gpointer self);
+static void library_window_on_action_radio (LibraryWindow* self,
+                                     GAction* action,
+                                     GVariant* value);
+static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self);
+static void library_window_on_events_sort_changed (LibraryWindow* self,
+                                            GSimpleAction* action,
+                                            GVariant* value);
+static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                                  GVariant* value,
+                                                                                  gpointer self);
+LibraryWindow* library_window_new (ProgressMonitor progress_monitor,
+                                   void* progress_monitor_target);
+LibraryWindow* library_window_construct (GType object_type,
+                                         ProgressMonitor progress_monitor,
+                                         void* progress_monitor_target);
 AppWindow* app_window_construct (GType object_type);
-static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time);
-static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self);
-SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
-SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
-void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position);
+static void library_window_external_drop_handler (LibraryWindow* self,
+                                           GdkDragContext* context,
+                                           SidebarEntry* entry,
+                                           GtkSelectionData* data,
+                                           guint info,
+                                           guint time);
+static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context,
+                                                                               SidebarEntry* entry,
+                                                                               GtkSelectionData* data,
+                                                                               guint info,
+                                                                               guint time,
+                                                                               gpointer self);
+SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries,
+                               int target_entries_length1,
+                               GdkDragAction actions,
+                               SidebarTreeExternalDropHandler drop_handler,
+                               void* drop_handler_target);
+SidebarTree* sidebar_tree_construct (GType object_type,
+                                     GtkTargetEntry* target_entries,
+                                     int target_entries_length1,
+                                     GdkDragAction actions,
+                                     SidebarTreeExternalDropHandler drop_handler,
+                                     void* drop_handler_target);
+void sidebar_tree_graft (SidebarTree* self,
+                         SidebarBranch* branch,
+                         gint position);
 ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner);
-ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type, GtkWindow* owner);
+ExtendedPropertiesWindow* extended_properties_window_construct (GType object_type,
+                                                                GtkWindow* owner);
 static void library_window_on_update_properties_now (LibraryWindow* self);
 static void _library_window_on_update_properties_now_one_shot_callback (gpointer self);
-OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
-OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
+OneShotScheduler* one_shot_scheduler_new (const gchar* name,
+                                          OneShotCallback callback,
+                                          void* callback_target);
+OneShotScheduler* one_shot_scheduler_construct (GType object_type,
+                                                const gchar* name,
+                                                OneShotCallback callback,
+                                                void* callback_target);
 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions);
-SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions);
-static void library_window_create_layout (LibraryWindow* self, Page* start_page);
+SearchFilterToolbar* search_filter_toolbar_construct (GType object_type,
+                                                      SearchFilterActions* actions);
+static void library_window_create_layout (LibraryWindow* self,
+                                   Page* start_page);
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType library_photos_entry_get_type (void) G_GNUC_CONST;
 LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self);
 Page* sidebar_page_representative_get_page (SidebarPageRepresentative* self);
 static void library_window_load_configuration (LibraryWindow* self);
-void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1);
+void application_set_accels_for_action (const gchar* action,
+                                        gchar** accel,
+                                        int accel_length1);
 GFile* directory_monitor_get_root (DirectoryMonitor* self);
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self);
-static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self);
+static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender,
+                                                                                               gpointer self);
 static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self);
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self);
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self);
-static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files);
-static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self);
+static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender,
+                                                                                                   gpointer self);
+static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender,
+                                                                                      gpointer self);
+static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self,
+                                                             gint completed_files,
+                                                             gint total_files);
+static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender,
+                                                                                                   gint completed_files,
+                                                                                                   gint total_files,
+                                                                                                   gpointer self);
 static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self);
-static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self);
-static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes);
-static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self);
+static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender,
+                                                                                                     gpointer self);
+static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self,
+                                                             guint64 completed_bytes,
+                                                             guint64 total_bytes);
+static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender,
+                                                                                                   guint64 completed_bytes,
+                                                                                                   guint64 total_bytes,
+                                                                                                   gpointer self);
 static void library_window_real_add_actions (AppWindow* base);
 void app_window_add_actions (AppWindow* self);
-GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1);
+GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self,
+                                                 int* result_length1);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
@@ -1448,68 +1637,111 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self);
 static GVariant* _variant_new2 (gboolean value);
 static gboolean library_window_is_toolbar_visible (LibraryWindow* self);
 static GVariant* _variant_new3 (gboolean value);
-static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page);
-void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page);
+static void library_window_real_switched_pages (PageWindow* base,
+                                         Page* old_page,
+                                         Page* new_page);
+void page_window_switched_pages (PageWindow* self,
+                                 Page* old_page,
+                                 Page* new_page);
 GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* 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;
-static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter);
-static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self);
-static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter);
-static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self);
-void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Page* old_page, Page* new_page);
+static void library_window_on_view_filter_installed (LibraryWindow* self,
+                                              ViewFilter* filter);
+static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender,
+                                                                                     ViewFilter* filer,
+                                                                                     gpointer self);
+static void library_window_on_view_filter_removed (LibraryWindow* self,
+                                            ViewFilter* filter);
+static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender,
+                                                                                 ViewFilter* filer,
+                                                                                 gpointer self);
+void search_filter_actions_monitor_page_contents (SearchFilterActions* self,
+                                                  Page* old_page,
+                                                  Page* new_page);
 static void library_window_on_view_filter_refreshed (LibraryWindow* self);
-static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self);
+static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender,
+                                                                   gpointer self);
 gboolean view_collection_are_items_filtered_out (ViewCollection* self);
 static GVariant* _variant_new4 (gboolean value);
 static void library_window_real_show_all (GtkWidget* base);
-GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning);
+GAction* page_get_common_action (Page* self,
+                                 const gchar* name,
+                                 gboolean log_warning);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
-static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page);
-static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page);
+static void library_window_init_view_filter (LibraryWindow* self,
+                                      CheckerboardPage* page);
+static void library_window_toggle_search_bar (LibraryWindow* self,
+                                       gboolean show,
+                                       CheckerboardPage* page);
 static gboolean library_window_should_show_search_bar (LibraryWindow* self);
-static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible);
+static void library_window_set_sidebar_visible (LibraryWindow* self,
+                                         gboolean visible);
 LibraryWindow* library_window_get_app (void);
 gboolean library_window_is_mount_uri_supported (const gchar* uri);
 static gchar* library_window_real_get_app_role (AppWindow* base);
 #define RESOURCES_APP_LIBRARY_ROLE _ ("Photo Manager")
 GType tag_get_type (void) G_GNUC_CONST;
-void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag);
+void library_window_rename_tag_in_sidebar (LibraryWindow* self,
+                                           Tag* tag);
 GType tags_sidebar_entry_get_type (void) G_GNUC_CONST;
-TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag);
-gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* entry);
+TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self,
+                                                 Tag* tag);
+gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self,
+                                             SidebarEntry* entry);
 GType event_source_get_type (void) G_GNUC_CONST;
 GType event_get_type (void) G_GNUC_CONST;
-void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event);
+void library_window_rename_event_in_sidebar (LibraryWindow* self,
+                                             Event* event);
 GType events_event_entry_get_type (void) G_GNUC_CONST;
-EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self, Event* event);
+EventsEventEntry* events_branch_get_entry_for_event (EventsBranch* self,
+                                                     Event* event);
 GType saved_search_get_type (void) G_GNUC_CONST;
-void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search);
+void library_window_rename_search_in_sidebar (LibraryWindow* self,
+                                              SavedSearch* search);
 GType searches_sidebar_entry_get_type (void) G_GNUC_CONST;
-SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self, SavedSearch* search);
+SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch* self,
+                                                                  SavedSearch* search);
 static void library_window_real_on_quit (AppWindow* base);
-void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions);
-void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position);
+void configuration_facade_set_library_window_state (ConfigurationFacade* self,
+                                                    gboolean maximize,
+                                                    Dimensions* dimensions);
+void configuration_facade_set_sidebar_position (ConfigurationFacade* self,
+                                                gint position);
 void app_window_on_quit (AppWindow* self);
 GType media_page_get_type (void) G_GNUC_CONST;
 GType collection_page_get_type (void) G_GNUC_CONST;
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
-static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page);
+static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self,
+                                                  CollectionPage* page);
 gint view_collection_get_selected_count (ViewCollection* self);
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
+GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self,
+                                                       GType t);
 GType library_photo_get_type (void) G_GNUC_CONST;
-GeeList* view_collection_get_sources_of_type (ViewCollection* self, GType t);
-static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection);
+GeeList* view_collection_get_sources_of_type (ViewCollection* self,
+                                              GType t);
+static gboolean library_window_get_fullscreen_photo (LibraryWindow* self,
+                                              Page* page,
+                                              CollectionPage* * collection,
+                                              Photo* * start,
+                                              ViewCollection* * view_collection);
 GType events_directory_page_get_type (void) G_GNUC_CONST;
 gint data_collection_get_count (DataCollection* self);
-DataObject* data_collection_get_at (DataCollection* self, gint index);
+DataObject* data_collection_get_at (DataCollection* self,
+                                    gint index);
 GType data_view_get_type (void) G_GNUC_CONST;
 DataSource* data_view_get_source (DataView* self);
 GType event_page_get_type (void) G_GNUC_CONST;
@@ -1518,36 +1750,68 @@ gboolean editing_host_page_has_photo (EditingHostPage* self);
 Photo* editing_host_page_get_photo (EditingHostPage* self);
 static void library_window_real_on_fullscreen (AppWindow* base);
 static GType library_window_fullscreen_photo_page_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view);
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view);
-void app_window_go_fullscreen (AppWindow* self, Page* page);
+static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection,
+                                                                            Photo* start,
+                                                                            ViewCollection* view);
+static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type,
+                                                                                  CollectionPage* collection,
+                                                                                  Photo* start,
+                                                                                  ViewCollection* view);
+void app_window_go_fullscreen (AppWindow* self,
+                               Page* page);
 #define RESOURCES_CANCEL_LABEL _ ("_Cancel")
 #define RESOURCES_OK_LABEL _ ("_OK")
 gboolean app_dirs_is_in_import_dir (GFile* file);
 GtkResponseType copy_files_dialog (void);
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse);
+static void library_window_dispatch_import_jobs (LibraryWindow* self,
+                                          GSList* uris,
+                                          const gchar* job_name,
+                                          gboolean copy_to_library,
+                                          gboolean recurse);
 static void _g_free0_ (gpointer var);
-static void _g_slist_free__g_free0_ (GSList* self);
+static inline void _g_slist_free__g_free0_ (GSList* self);
 GType data_imports_ui_data_imports_dialog_get_type (void) G_GNUC_CONST;
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_create_instance (void);
-static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page);
-void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page);
-void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive);
-static void library_window_real_update_common_actions (AppWindow* base, Page* page, gint selected_count, gint count);
+static void library_window_real_update_common_action_availability (AppWindow* base,
+                                                            Page* old_page,
+                                                            Page* new_page);
+void app_window_update_common_action_availability (AppWindow* self,
+                                                   Page* old_page,
+                                                   Page* new_page);
+void app_window_set_common_action_sensitive (AppWindow* self,
+                                             const gchar* name,
+                                             gboolean sensitive);
+static void library_window_real_update_common_actions (AppWindow* base,
+                                                Page* page,
+                                                gint selected_count,
+                                                gint count);
 static gboolean library_window_can_empty_trash (LibraryWindow* self);
-void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible);
+void app_window_set_common_action_visible (AppWindow* self,
+                                           const gchar* name,
+                                           gboolean visible);
 static gboolean library_window_can_jump_to_event (LibraryWindow* self);
-void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count);
+void app_window_update_common_actions (AppWindow* self,
+                                       Page* page,
+                                       gint selected_count,
+                                       gint count);
 GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
 gint media_source_collection_get_trashcan_count (MediaSourceCollection* self);
 GType video_source_collection_get_type (void) G_GNUC_CONST;
 GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self);
-void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text);
+void remove_from_app (GeeCollection* sources,
+                      const gchar* dialog_title,
+                      const gchar* progress_dialog_text);
 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);
@@ -1556,99 +1820,194 @@ SavedSearchDialog* saved_search_dialog_new (void);
 SavedSearchDialog* saved_search_dialog_construct (GType object_type);
 GType saved_search_dialog_get_type (void) G_GNUC_CONST;
 void saved_search_dialog_show (SavedSearchDialog* self);
-DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
+DataSource* view_collection_get_selected_source_at (ViewCollection* self,
+                                                    gint index);
 Event* media_source_get_event (MediaSource* self);
-void library_window_switch_to_event (LibraryWindow* self, Event* event);
+void library_window_switch_to_event (LibraryWindow* self,
+                                     Event* event);
 static GVariant* _variant_new5 (gboolean value);
 void search_filter_toolbar_take_focus (SearchFilterToolbar* self);
 static void library_window_on_clear_search (LibraryWindow* self);
 void search_filter_actions_reset (SearchFilterActions* self);
 gint library_window_get_events_sort (LibraryWindow* self);
-void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort);
+void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self,
+                                                     gboolean sort);
 void preferences_dialog_show_preferences (void);
-void properties_update_properties (Properties* self, Page* page);
-void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display);
+void properties_update_properties (Properties* self,
+                                   Page* page);
+void configuration_facade_set_display_basic_properties (ConfigurationFacade* self,
+                                                        gboolean display);
 static gboolean _variant_get6 (GVariant* value);
 static GVariant* _variant_new7 (gboolean value);
-void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page);
-void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display);
-void library_window_show_search_bar (LibraryWindow* self, gboolean display);
+void extended_properties_window_update_properties (ExtendedPropertiesWindow* self,
+                                                   Page* page);
+void configuration_facade_set_display_search_bar (ConfigurationFacade* self,
+                                                  gboolean display);
+void library_window_show_search_bar (LibraryWindow* self,
+                                     gboolean display);
 static GVariant* _variant_new8 (gboolean value);
-void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display);
+void configuration_facade_set_display_sidebar (ConfigurationFacade* self,
+                                               gboolean display);
 gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self);
-static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible);
+static void library_window_set_toolbar_visible (LibraryWindow* self,
+                                         gboolean visible);
 GtkToolbar* page_get_toolbar (Page* self);
-void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display);
+void configuration_facade_set_display_toolbar (ConfigurationFacade* self,
+                                               gboolean display);
 gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self);
-static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show);
+static void library_window_sync_extended_properties (LibraryWindow* self,
+                                              gboolean show);
 static GVariant* _variant_new9 (gboolean value);
-void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display);
+void configuration_facade_set_display_extended_properties (ConfigurationFacade* self,
+                                                           gboolean display);
 GType batch_import_get_type (void) G_GNUC_CONST;
-void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
+void library_window_enqueue_batch_import (LibraryWindow* self,
+                                          BatchImport* batch_import,
+                                          gboolean allow_user_cancel);
 GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
 GType library_import_queue_sidebar_entry_get_type (void) G_GNUC_CONST;
 LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self);
-void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self, BatchImport* batch_import, gboolean allow_user_cancel);
+void library_import_queue_sidebar_entry_enqueue_and_schedule (LibraryImportQueueSidebarEntry* self,
+                                                              BatchImport* batch_import,
+                                                              gboolean allow_user_cancel);
 gpointer import_manifest_ref (gpointer instance);
 void import_manifest_unref (gpointer instance);
-GParamSpec* param_spec_import_manifest (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_import_manifest (GValue* value, gpointer v_object);
-void value_take_import_manifest (GValue* value, gpointer v_object);
+GParamSpec* param_spec_import_manifest (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_import_manifest (GValue* value,
+                                gpointer v_object);
+void value_take_import_manifest (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_import_manifest (const GValue* value);
 GType import_manifest_get_type (void) G_GNUC_CONST;
-static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest);
+static void library_window_import_reporter (LibraryWindow* self,
+                                     ImportManifest* manifest);
 gpointer import_ui_question_params_ref (gpointer instance);
 void import_ui_question_params_unref (gpointer instance);
-GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void import_ui_value_set_question_params (GValue* value, gpointer v_object);
-void import_ui_value_take_question_params (GValue* value, gpointer v_object);
+GParamSpec* import_ui_param_spec_question_params (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void import_ui_value_set_question_params (GValue* value,
+                                          gpointer v_object);
+void import_ui_value_take_question_params (GValue* value,
+                                           gpointer v_object);
 gpointer import_ui_value_get_question_params (const GValue* value);
 GType import_ui_question_params_get_type (void) G_GNUC_CONST;
-gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest_id, ImportUIQuestionParams* question);
+gboolean import_ui_report_manifest (ImportManifest* manifest,
+                                    gboolean show_dest_id,
+                                    ImportUIQuestionParams* question);
 GFile* app_dirs_get_import_dir (void);
-GtkResponseType app_window_affirm_cancel_question (const gchar* message, const gchar* affirmative, const gchar* title, GtkWindow* parent);
+GtkResponseType app_window_affirm_cancel_question (const gchar* message,
+                                                   const gchar* affirmative,
+                                                   const gchar* title,
+                                                   GtkWindow* parent);
 AppWindow* app_window_get_instance (void);
 gpointer batch_import_job_ref (gpointer instance);
 void batch_import_job_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_job (GValue* value, gpointer v_object);
-void value_take_batch_import_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_job (const gchar* name,
+                                         const gchar* nick,
+                                         const gchar* blurb,
+                                         GType object_type,
+                                         GParamFlags flags);
+void value_set_batch_import_job (GValue* value,
+                                 gpointer v_object);
+void value_take_batch_import_job (GValue* value,
+                                  gpointer v_object);
 gpointer value_get_batch_import_job (const GValue* value);
 GType batch_import_job_get_type (void) G_GNUC_CONST;
 GType file_import_job_get_type (void) G_GNUC_CONST;
-void app_window_error_message (const gchar* message, GtkWindow* parent);
-FileImportJob* file_import_job_new (GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
-FileImportJob* file_import_job_construct (GType object_type, GFile* file_or_dir, gboolean copy_to_library, gboolean recurse);
+void app_window_error_message (const gchar* message,
+                               GtkWindow* parent);
+FileImportJob* file_import_job_new (GFile* file_or_dir,
+                                    gboolean copy_to_library,
+                                    gboolean recurse);
+FileImportJob* file_import_job_construct (GType object_type,
+                                          GFile* file_or_dir,
+                                          gboolean copy_to_library,
+                                          gboolean recurse);
 gpointer batch_import_roll_ref (gpointer instance);
 void batch_import_roll_unref (gpointer instance);
-GParamSpec* param_spec_batch_import_roll (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_batch_import_roll (GValue* value, gpointer v_object);
-void value_take_batch_import_roll (GValue* value, gpointer v_object);
+GParamSpec* param_spec_batch_import_roll (const gchar* name,
+                                          const gchar* nick,
+                                          const gchar* blurb,
+                                          GType object_type,
+                                          GParamFlags flags);
+void value_set_batch_import_roll (GValue* value,
+                                  gpointer v_object);
+void value_take_batch_import_roll (GValue* value,
+                                   gpointer v_object);
 gpointer value_get_batch_import_roll (const GValue* value);
 GType batch_import_roll_get_type (void) G_GNUC_CONST;
-static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self);
-BatchImport* batch_import_new (GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
-BatchImport* batch_import_construct (GType object_type, GeeIterable* jobs, const gchar* name, BatchImportImportReporter reporter, void* reporter_target, GeeArrayList* prefailed, GeeArrayList* pre_already_imported, GCancellable* cancellable, BatchImportRoll* import_roll, ImportManifest* skip_manifest);
+static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+                                                                   BatchImportRoll* import_roll,
+                                                                   gpointer self);
+BatchImport* batch_import_new (GeeIterable* jobs,
+                               const gchar* name,
+                               BatchImportImportReporter reporter,
+                               void* reporter_target,
+                               GeeArrayList* prefailed,
+                               GeeArrayList* pre_already_imported,
+                               GCancellable* cancellable,
+                               BatchImportRoll* import_roll,
+                               ImportManifest* skip_manifest);
+BatchImport* batch_import_construct (GType object_type,
+                                     GeeIterable* jobs,
+                                     const gchar* name,
+                                     BatchImportImportReporter reporter,
+                                     void* reporter_target,
+                                     GeeArrayList* prefailed,
+                                     GeeArrayList* pre_already_imported,
+                                     GCancellable* cancellable,
+                                     BatchImportRoll* import_roll,
+                                     ImportManifest* skip_manifest);
 void library_window_switch_to_import_queue_page (LibraryWindow* self);
 static GdkDragAction library_window_get_drag_action (LibraryWindow* self);
-static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time);
-static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time);
+static gboolean library_window_real_drag_motion (GtkWidget* base,
+                                          GdkDragContext* context,
+                                          gint x,
+                                          gint y,
+                                          guint time);
+static void library_window_real_drag_data_received (GtkWidget* base,
+                                             GdkDragContext* context,
+                                             gint x,
+                                             gint y,
+                                             GtkSelectionData* selection_data,
+                                             guint info,
+                                             guint time);
 void library_window_switch_to_library_page (LibraryWindow* self);
-void library_window_switch_to_page (LibraryWindow* self, Page* page);
-void library_window_switch_to_tag (LibraryWindow* self, Tag* tag);
-void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search);
-void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
+void library_window_switch_to_page (LibraryWindow* self,
+                                    Page* page);
+void library_window_switch_to_tag (LibraryWindow* self,
+                                   Tag* tag);
+void library_window_switch_to_saved_search (LibraryWindow* self,
+                                            SavedSearch* search);
+void library_window_switch_to_photo_page (LibraryWindow* self,
+                                          CollectionPage* controller,
+                                          Photo* current);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+                                               DataSource* source);
 LibraryPhotoPage* library_photo_page_new (void);
 LibraryPhotoPage* library_photo_page_construct (GType object_type);
-void library_window_add_to_stack (LibraryWindow* self, Page* page);
+void library_window_add_to_stack (LibraryWindow* self,
+                                  Page* page);
 void spin_event_loop (void);
-void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view);
+void library_photo_page_display_for_collection (LibraryPhotoPage* self,
+                                                CollectionPage* return_page,
+                                                Photo* photo,
+                                                ViewCollection* view);
 GType camera_sidebar_entry_get_type (void) G_GNUC_CONST;
-CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self, DiscoveredCamera* camera);
+CameraSidebarEntry* camera_branch_get_entry_for_camera (CameraBranch* self,
+                                                        DiscoveredCamera* camera);
 GType import_page_get_type (void) G_GNUC_CONST;
-gboolean import_page_unmount_camera (ImportPage* self, GMount* mount);
-static void library_window_remove_from_stack (LibraryWindow* self, Page* page);
+gboolean import_page_unmount_camera (ImportPage* self,
+                                     GMount* mount);
+static void library_window_remove_from_stack (LibraryWindow* self,
+                                       Page* page);
 gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self);
 static GVariant* _variant_new10 (gboolean value);
 gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self);
@@ -1656,36 +2015,54 @@ static GVariant* _variant_new11 (gboolean value);
 static GVariant* _variant_new12 (gboolean value);
 gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self);
 static GVariant* _variant_new13 (const gchar* value);
-static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority);
-static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear);
+static void library_window_start_pulse_background_progress_bar (LibraryWindow* self,
+                                                         const gchar* label,
+                                                         gint priority);
+static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self,
+                                                        gint priority,
+                                                        gboolean clear);
 static void library_window_show_background_progress_bar (LibraryWindow* self);
 static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self);
 static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self);
-static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority);
-static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total);
+static void library_window_clear_background_progress_bar (LibraryWindow* self,
+                                                   gint priority);
+static void library_window_update_background_progress_bar (LibraryWindow* self,
+                                                    const gchar* label,
+                                                    gint priority,
+                                                    gdouble count,
+                                                    gdouble total);
 static void library_window_hide_background_progress_bar (LibraryWindow* self);
 gint configuration_facade_get_sidebar_position (ConfigurationFacade* self);
 gint library_window_get_PAGE_MIN_WIDTH (void);
-static void library_window_real_set_current_page (PageWindow* base, Page* page);
-void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable);
+static void library_window_real_set_current_page (PageWindow* base,
+                                           Page* page);
+void library_window_set_page_switching_enabled (LibraryWindow* self,
+                                                gboolean should_enable);
 void application_set_menubar (GMenuModel* model);
 void page_switching_from (Page* self);
 void sidebar_tree_enable_editing (SidebarTree* self);
-void page_window_set_current_page (PageWindow* self, Page* page);
+void page_window_set_current_page (PageWindow* self,
+                                   Page* page);
 void sidebar_tree_disable_editing (SidebarTree* self);
 GType sidebar_expandable_entry_get_type (void) G_GNUC_CONST;
 gboolean sidebar_expandable_entry_expand_on_select (SidebarExpandableEntry* self);
-gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry);
-gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboolean mask_signal);
+gboolean sidebar_tree_expand_to_entry (SidebarTree* self,
+                                       SidebarEntry* entry);
+gboolean sidebar_tree_place_cursor (SidebarTree* self,
+                                    SidebarEntry* entry,
+                                    gboolean mask_signal);
 static void library_window_on_update_properties (LibraryWindow* self);
-static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page);
+static void library_window_subscribe_for_basic_information (LibraryWindow* self,
+                                                     Page* page);
 void page_switched_to (Page* self);
 GMenuModel* page_get_menubar (Page* self);
 void page_ready (Page* self);
 GType search_view_filter_get_type (void) G_GNUC_CONST;
-void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter);
+void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self,
+                                            SearchViewFilter* search_filter);
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self);
-void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
+void view_collection_install_view_filter (ViewCollection* self,
+                                          ViewFilter* f);
 DisabledViewFilter* disabled_view_filter_new (void);
 DisabledViewFilter* disabled_view_filter_construct (GType object_type);
 GType disabled_view_filter_get_type (void) G_GNUC_CONST;
@@ -1696,132 +2073,208 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self);
 GType events_directory_entry_get_type (void) G_GNUC_CONST;
 GType events_master_directory_entry_get_type (void) G_GNUC_CONST;
 EventsMasterDirectoryEntry* events_branch_get_master_entry (EventsBranch* self);
-static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self);
-static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self);
-static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self);
+static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender,
+                                                                               GeeIterable* changed,
+                                                                               gpointer self);
+static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender,
+                                                                         GeeMap* items,
+                                                                         gpointer self);
+static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender,
+                                                                            GeeIterable* added,
+                                                                            GeeIterable* removed,
+                                                                            gpointer self);
+static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender,
+                                                                                    GeeCollection* changed,
+                                                                                    gpointer self);
 void one_shot_scheduler_at_idle (OneShotScheduler* self);
-void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup);
+void library_window_mounted_camera_shell_notification (LibraryWindow* self,
+                                                       const gchar* uri,
+                                                       gboolean at_startup);
 gchar* camera_table_get_port_uri (const gchar* port);
 gboolean is_string_empty (const gchar* s);
-static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* event);
+static gboolean library_window_real_key_press_event (GtkWidget* base,
+                                              GdkEventKey* event);
+gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self,
+                                               GdkEventKey* event);
 gint thumbnail_get_MAX_SCALE (void);
 #define CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING 24
 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 zoom_buffer_get_type (void) G_GNUC_CONST;
 GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
 #define LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPagePrivate))
-enum  {
-	LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_DUMMY_PROPERTY
-};
 static void library_window_fullscreen_photo_page_real_switched_to (Page* base);
 static void library_window_fullscreen_photo_page_real_switching_from (Page* base);
-static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
+static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
+                                                                          GeeList* ui_filenames);
 static void library_window_fullscreen_photo_page_finalize (GObject * obj);
 static void library_window_finalize (GObject * obj);
-static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_library_window_get_property (GObject * object,
+                                        guint property_id,
+                                        GValue * value,
+                                        GParamSpec * pspec);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
 static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[3] = {"gphoto2:", "disk:", "file:"};
 const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (guint) GTK_TARGET_OTHER_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_URI_LIST}, {LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE, (guint) GTK_TARGET_SAME_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST}, {LIBRARY_WINDOW_TAG_PATH_MIME_TYPE, (guint) GTK_TARGET_SAME_WIDGET, (guint) LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH}};
 static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", NULL, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", NULL, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}};
 
-static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
+static void
+_library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender,
+                                                           SidebarPageRepresentative* entry,
+                                                           Page* page,
+                                                           gpointer self)
+{
 #line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_page_created ((LibraryWindow*) self, entry, page);
-#line 1744 "LibraryWindow.c"
+#line 2150 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
+static void
+_library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender,
+                                                                 SidebarPageRepresentative* entry,
+                                                                 Page* page,
+                                                                 gpointer self)
+{
 #line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
-#line 1751 "LibraryWindow.c"
+#line 2162 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) {
+static void
+_library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender,
+                                                                       SidebarSelectableEntry* selectable,
+                                                                       gpointer self)
+{
 #line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
-#line 1758 "LibraryWindow.c"
+#line 2173 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) {
+static void
+_library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender,
+                                                                                       SidebarSelectableEntry* removed,
+                                                                                       gpointer self)
+{
 #line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
-#line 1765 "LibraryWindow.c"
+#line 2184 "LibraryWindow.c"
 }
 
 
-static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) {
+static void
+_library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender,
+                                                          gpointer self)
+{
 #line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_extended_properties ((LibraryWindow*) self);
-#line 1772 "LibraryWindow.c"
+#line 2194 "LibraryWindow.c"
 }
 
 
-static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) {
+static void
+_library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender,
+                                                          gpointer self)
+{
 #line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_extended_properties ((LibraryWindow*) self);
-#line 1779 "LibraryWindow.c"
+#line 2204 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                GeeCollection* added,
+                                                                                                GeeCollection* removed,
+                                                                                                gpointer self)
+{
 #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
-#line 1786 "LibraryWindow.c"
+#line 2216 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                GeeMap* items,
+                                                                gpointer self)
+{
 #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_media_altered ((LibraryWindow*) self);
-#line 1793 "LibraryWindow.c"
+#line 2227 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) {
+static void
+_library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender,
+                                                                      guint completed,
+                                                                      guint total,
+                                                                      gpointer self)
+{
 #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
-#line 1800 "LibraryWindow.c"
+#line 2239 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
+static void
+_library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender,
+                                                                                     LibraryMonitor* monitor,
+                                                                                     gpointer self)
+{
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
-#line 1807 "LibraryWindow.c"
+#line 2250 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
+static void
+_library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender,
+                                                                                     LibraryMonitor* monitor,
+                                                                                     gpointer self)
+{
 #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
-#line 1814 "LibraryWindow.c"
+#line 2261 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
+static void
+_library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender,
+                                                           DiscoveredCamera* camera,
+                                                           gpointer self)
+{
 #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_camera_added ((LibraryWindow*) self, camera);
-#line 1821 "LibraryWindow.c"
+#line 2272 "LibraryWindow.c"
 }
 
 
-static GType library_window_sidebar_root_position_get_type (void) {
+static GType
+library_window_sidebar_root_position_get_type (void)
+{
 	static volatile gsize library_window_sidebar_root_position_type_id__volatile = 0;
 	if (g_once_init_enter (&library_window_sidebar_root_position_type_id__volatile)) {
 		static const GEnumValue values[] = {{LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY", "library"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS", "cameras"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH", "saved-search"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS", "events"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS", "folders"}, {LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS, "LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS", "tags"}, {0, NULL, NULL}};
@@ -1833,7 +2286,9 @@ static GType library_window_sidebar_root_position_get_type (void) {
 }
 
 
-GType library_window_target_type_get_type (void) {
+GType
+library_window_target_type_get_type (void)
+{
 	static volatile gsize library_window_target_type_type_id__volatile = 0;
 	if (g_once_init_enter (&library_window_target_type_type_id__volatile)) {
 		static const GEnumValue values[] = {{LIBRARY_WINDOW_TARGET_TYPE_URI_LIST, "LIBRARY_WINDOW_TARGET_TYPE_URI_LIST", "uri-list"}, {LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST, "LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST", "media-list"}, {LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH, "LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH", "tag-path"}, {0, NULL, NULL}};
@@ -1845,126 +2300,199 @@ GType library_window_target_type_get_type (void) {
 }
 
 
-static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_file_import ((LibraryWindow*) self);
-#line 1852 "LibraryWindow.c"
+#line 2311 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                             GVariant* parameter,
+                                                                             gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_external_library_import ((LibraryWindow*) self);
-#line 1859 "LibraryWindow.c"
+#line 2322 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_preferences ((LibraryWindow*) self);
-#line 1866 "LibraryWindow.c"
+#line 2333 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_empty_trash ((LibraryWindow*) self);
-#line 1873 "LibraryWindow.c"
+#line 2344 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_jump_to_event ((LibraryWindow*) self);
-#line 1880 "LibraryWindow.c"
+#line 2355 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action,
+                                                          GVariant* parameter,
+                                                          gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_find ((LibraryWindow*) self);
-#line 1887 "LibraryWindow.c"
+#line 2366 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                GVariant* parameter,
+                                                                gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_new_search ((LibraryWindow*) self);
-#line 1894 "LibraryWindow.c"
+#line 2377 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
-#line 1901 "LibraryWindow.c"
+#line 2388 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                                  GVariant* value,
+                                                                                  gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
-#line 1908 "LibraryWindow.c"
+#line 2399 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                                     GVariant* value,
+                                                                                     gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
-#line 1915 "LibraryWindow.c"
+#line 2410 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                           GVariant* value,
+                                                                           gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
-#line 1922 "LibraryWindow.c"
+#line 2421 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                         GVariant* value,
+                                                                         gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
-#line 1929 "LibraryWindow.c"
+#line 2432 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                         GVariant* value,
+                                                                         gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
-#line 1936 "LibraryWindow.c"
+#line 2443 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                  GVariant* parameter,
+                                                                  gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
-#line 1943 "LibraryWindow.c"
+#line 2454 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                             GVariant* value,
+                                                                             gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
-#line 1950 "LibraryWindow.c"
+#line 2465 "LibraryWindow.c"
 }
 
 
-static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) {
+static void
+_library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context,
+                                                                          SidebarEntry* entry,
+                                                                          GtkSelectionData* data,
+                                                                          guint info,
+                                                                          guint time,
+                                                                          gpointer self)
+{
 #line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
-#line 1957 "LibraryWindow.c"
+#line 2479 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) {
+static void
+_library_window_on_update_properties_now_one_shot_callback (gpointer self)
+{
 #line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties_now ((LibraryWindow*) self);
-#line 1964 "LibraryWindow.c"
+#line 2488 "LibraryWindow.c"
 }
 
 
-LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target) {
+LibraryWindow*
+library_window_construct (GType object_type,
+                          ProgressMonitor progress_monitor,
+                          void* progress_monitor_target)
+{
 	LibraryWindow * self = NULL;
 	SidebarTree* _tmp0_;
 	SidebarTree* _tmp1_;
@@ -1995,30 +2523,30 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	Page* _tmp26_;
 	Page* _tmp27_;
 	GtkTargetEntry* main_window_dnd_targets = NULL;
+	GtkTargetEntry _tmp39_;
 	GtkTargetEntry _tmp40_;
-	GtkTargetEntry _tmp41_;
-	GtkTargetEntry* _tmp42_;
+	GtkTargetEntry* _tmp41_;
 	gint main_window_dnd_targets_length1;
 	gint _main_window_dnd_targets_size_;
-	GtkTargetEntry* _tmp43_;
-	gint _tmp43__length1;
+	GtkTargetEntry* _tmp42_;
+	gint _tmp42__length1;
+	MetadataWriter* _tmp43_;
 	MetadataWriter* _tmp44_;
-	MetadataWriter* _tmp45_;
 	LibraryMonitor* monitor = NULL;
+	LibraryMonitorPool* _tmp45_;
 	LibraryMonitorPool* _tmp46_;
-	LibraryMonitorPool* _tmp47_;
+	LibraryMonitor* _tmp47_;
 	LibraryMonitor* _tmp48_;
 	LibraryMonitor* _tmp49_;
-	LibraryMonitor* _tmp50_;
+	LibraryMonitorPool* _tmp51_;
 	LibraryMonitorPool* _tmp52_;
 	LibraryMonitorPool* _tmp53_;
 	LibraryMonitorPool* _tmp54_;
-	LibraryMonitorPool* _tmp55_;
+	CameraTable* _tmp55_;
 	CameraTable* _tmp56_;
-	CameraTable* _tmp57_;
-	GtkProgressBar* _tmp58_;
+	GtkProgressBar* _tmp57_;
 #line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	static const gchar* accels[] = {"<Primary>f", "F8", NULL};
+	static const gchar* accels[3] = {"<Primary>f", "F8", NULL};
 #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = (LibraryWindow*) app_window_construct (object_type);
 #line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2129,7 +2657,7 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	_g_object_unref0 (_tmp27_);
 #line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_load_configuration (self);
-#line 2133 "LibraryWindow.c"
+#line 2661 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp28_;
@@ -2158,128 +2686,125 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 		_media_sources_it = _tmp33_;
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 2162 "LibraryWindow.c"
+#line 2690 "LibraryWindow.c"
 			GeeIterator* _tmp34_;
-			gboolean _tmp35_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp36_;
-			gpointer _tmp37_;
+			GeeIterator* _tmp35_;
+			gpointer _tmp36_;
+			MediaSourceCollection* _tmp37_;
 			MediaSourceCollection* _tmp38_;
-			MediaSourceCollection* _tmp39_;
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = _media_sources_it;
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp35_ = gee_iterator_next (_tmp34_);
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			if (!_tmp35_) {
+			if (!gee_iterator_next (_tmp34_)) {
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 2178 "LibraryWindow.c"
+#line 2703 "LibraryWindow.c"
 			}
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp36_ = _media_sources_it;
+			_tmp35_ = _media_sources_it;
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp37_ = gee_iterator_get (_tmp36_);
+			_tmp36_ = gee_iterator_get (_tmp35_);
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp37_;
+			media_sources = (MediaSourceCollection*) _tmp36_;
 #line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp38_ = media_sources;
+			_tmp37_ = media_sources;
 #line 188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
+			g_signal_connect_object (_tmp37_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
 #line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp39_ = media_sources;
+			_tmp38_ = media_sources;
 #line 189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
+			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 2196 "LibraryWindow.c"
+#line 2721 "LibraryWindow.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 2200 "LibraryWindow.c"
+#line 2725 "LibraryWindow.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
+	_tmp39_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
+	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_ = g_new0 (GtkTargetEntry, 2);
+	_tmp41_ = g_new0 (GtkTargetEntry, 2);
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_[0] = _tmp40_;
+	_tmp41_[0] = _tmp39_;
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_[1] = _tmp41_;
+	_tmp41_[1] = _tmp40_;
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	main_window_dnd_targets = _tmp42_;
+	main_window_dnd_targets = _tmp41_;
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets_length1 = 2;
 #line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
 #line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp43_ = main_window_dnd_targets;
+	_tmp42_ = main_window_dnd_targets;
 #line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp43__length1 = main_window_dnd_targets_length1;
+	_tmp42__length1 = main_window_dnd_targets_length1;
 #line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
+	gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp42_, _tmp42__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
 #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44_ = metadata_writer_get_instance ();
+	_tmp43_ = metadata_writer_get_instance ();
 #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp45_ = _tmp44_;
+	_tmp44_ = _tmp43_;
 #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
+	g_signal_connect_object (_tmp44_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
 #line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp45_);
+	_g_object_unref0 (_tmp44_);
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_ = library_monitor_pool_get_instance ();
+	_tmp45_ = library_monitor_pool_get_instance ();
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp47_ = _tmp46_;
+	_tmp46_ = _tmp45_;
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp48_ = library_monitor_pool_get_monitor (_tmp47_);
+	_tmp47_ = library_monitor_pool_get_monitor (_tmp46_);
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp49_ = _tmp48_;
+	_tmp48_ = _tmp47_;
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp47_);
+	_library_monitor_pool_unref0 (_tmp46_);
 #line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp49_;
+	monitor = _tmp48_;
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_ = monitor;
+	_tmp49_ = monitor;
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp50_ != NULL) {
-#line 2248 "LibraryWindow.c"
-		LibraryMonitor* _tmp51_;
+	if (_tmp49_ != NULL) {
+#line 2773 "LibraryWindow.c"
+		LibraryMonitor* _tmp50_;
 #line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp51_ = monitor;
+		_tmp50_ = monitor;
 #line 207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_on_library_monitor_installed (self, _tmp51_);
-#line 2254 "LibraryWindow.c"
+		library_window_on_library_monitor_installed (self, _tmp50_);
+#line 2779 "LibraryWindow.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp52_ = library_monitor_pool_get_instance ();
+	_tmp51_ = library_monitor_pool_get_instance ();
 #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp53_ = _tmp52_;
+	_tmp52_ = _tmp51_;
 #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
+	g_signal_connect_object (_tmp52_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
 #line 209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp53_);
+	_library_monitor_pool_unref0 (_tmp52_);
 #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_ = library_monitor_pool_get_instance ();
+	_tmp53_ = library_monitor_pool_get_instance ();
 #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp55_ = _tmp54_;
+	_tmp54_ = _tmp53_;
 #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
+	g_signal_connect_object (_tmp54_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
 #line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp55_);
+	_library_monitor_pool_unref0 (_tmp54_);
 #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp56_ = camera_table_get_instance ();
+	_tmp55_ = camera_table_get_instance ();
 #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp57_ = _tmp56_;
+	_tmp56_ = _tmp55_;
 #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
+	g_signal_connect_object (_tmp56_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
 #line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_camera_table_unref0 (_tmp57_);
+	_camera_table_unref0 (_tmp56_);
 #line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_ = self->priv->background_progress_bar;
+	_tmp57_ = self->priv->background_progress_bar;
 #line 214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_show_text (_tmp58_, TRUE);
+	gtk_progress_bar_set_show_text (_tmp57_, TRUE);
 #line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	application_set_accels_for_action ("win.CommonDisplaySearchbar", accels, G_N_ELEMENTS (accels));
 #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2288,219 +2813,216 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
 #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 2292 "LibraryWindow.c"
+#line 2817 "LibraryWindow.c"
 }
 
 
-LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) {
+LibraryWindow*
+library_window_new (ProgressMonitor progress_monitor,
+                    void* progress_monitor_target)
+{
 #line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
-#line 2299 "LibraryWindow.c"
+#line 2827 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender,
+                                                                                          gpointer self)
+{
 #line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
-#line 2306 "LibraryWindow.c"
+#line 2837 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender,
+                                                                                              gpointer self)
+{
 #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2313 "LibraryWindow.c"
+#line 2847 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender,
+                                                                                 gpointer self)
+{
 #line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2320 "LibraryWindow.c"
+#line 2857 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) {
+static void
+_library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender,
+                                                                                              gint completed_files,
+                                                                                              gint total_files,
+                                                                                              gpointer self)
+{
 #line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
-#line 2327 "LibraryWindow.c"
+#line 2869 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) {
+static void
+_library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender,
+                                                                                                gpointer self)
+{
 #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self);
-#line 2334 "LibraryWindow.c"
+#line 2879 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
+static void
+_library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender,
+                                                                                              guint64 completed_bytes,
+                                                                                              guint64 total_bytes,
+                                                                                              gpointer self)
+{
 #line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
-#line 2341 "LibraryWindow.c"
+#line 2891 "LibraryWindow.c"
 }
 
 
-static void library_window_on_library_monitor_installed (LibraryWindow* self, LibraryMonitor* monitor) {
-	LibraryMonitor* _tmp0_;
+static void
+library_window_on_library_monitor_installed (LibraryWindow* self,
+                                             LibraryMonitor* monitor)
+{
+	GFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
+	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
-	LibraryMonitor* _tmp5_;
-	LibraryMonitor* _tmp6_;
-	LibraryMonitor* _tmp7_;
-	LibraryMonitor* _tmp8_;
-	LibraryMonitor* _tmp9_;
-	LibraryMonitor* _tmp10_;
 #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = monitor;
-#line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
+	_tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = g_file_get_path (_tmp2_);
+	_tmp2_ = g_file_get_path (_tmp1_);
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp4_);
+	g_debug ("LibraryWindow.vala:251: on_library_monitor_installed: %s", _tmp3_);
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp2_);
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = monitor;
+	_g_object_unref0 (_tmp1_);
 #line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
-#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = monitor;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
 #line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
 #line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = monitor;
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
-#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = monitor;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
 #line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
+	g_signal_connect_object (monitor, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
 #line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = monitor;
-#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = monitor;
+	g_signal_connect_object (monitor, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
 #line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0);
-#line 2401 "LibraryWindow.c"
+	g_signal_connect_object (monitor, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0);
+#line 2933 "LibraryWindow.c"
 }
 
 
-static void library_window_on_library_monitor_destroyed (LibraryWindow* self, LibraryMonitor* monitor) {
-	LibraryMonitor* _tmp0_;
+static void
+library_window_on_library_monitor_destroyed (LibraryWindow* self,
+                                             LibraryMonitor* monitor)
+{
+	GFile* _tmp0_;
 	GFile* _tmp1_;
-	GFile* _tmp2_;
+	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
-	LibraryMonitor* _tmp5_;
+	guint _tmp4_;
+	guint _tmp5_;
 	guint _tmp6_;
-	LibraryMonitor* _tmp7_;
+	guint _tmp7_;
 	guint _tmp8_;
-	LibraryMonitor* _tmp9_;
-	guint _tmp10_;
-	LibraryMonitor* _tmp11_;
-	guint _tmp12_;
-	LibraryMonitor* _tmp13_;
-	guint _tmp14_;
-	LibraryMonitor* _tmp15_;
-	guint _tmp16_;
+	guint _tmp9_;
 #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = monitor;
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
+	_tmp0_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = g_file_get_path (_tmp2_);
+	_tmp2_ = g_file_get_path (_tmp1_);
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp4_);
+	g_debug ("LibraryWindow.vala:262: on_library_monitor_destroyed: %s", _tmp3_);
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp2_);
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = monitor;
+	_g_object_unref0 (_tmp1_);
 #line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
+	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp4_, NULL, FALSE);
 #line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = monitor;
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
 #line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE);
+	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp5_, NULL, FALSE);
 #line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
 #line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = monitor;
+	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
 #line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
-#line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = monitor;
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (monitor, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
 #line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE);
+	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp7_, NULL, FALSE);
 #line 267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
+	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
 #line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = monitor;
+	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp8_, NULL, FALSE);
 #line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE);
-#line 268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
-#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = monitor;
+	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
 #line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE);
+	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp9_, NULL, FALSE);
 #line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self);
-#line 2479 "LibraryWindow.c"
+	g_signal_handlers_disconnect_matched (monitor, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self);
+#line 2993 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new1 (gboolean value) {
+static GVariant*
+_variant_new1 (gboolean value)
+{
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2486 "LibraryWindow.c"
+#line 3002 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new2 (gboolean value) {
+static GVariant*
+_variant_new2 (gboolean value)
+{
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2493 "LibraryWindow.c"
+#line 3011 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new3 (gboolean value) {
+static GVariant*
+_variant_new3 (gboolean value)
+{
 #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2500 "LibraryWindow.c"
+#line 3020 "LibraryWindow.c"
 }
 
 
-static void library_window_real_add_actions (AppWindow* base) {
+static void
+library_window_real_add_actions (AppWindow* base)
+{
 	LibraryWindow * self;
 	SearchFilterActions* _tmp0_;
 	gint _tmp1_;
@@ -2509,14 +3031,11 @@ static void library_window_real_add_actions (AppWindow* base) {
 	GAction* _tmp4_;
 	ConfigFacade* _tmp5_;
 	ConfigFacade* _tmp6_;
-	gboolean _tmp7_;
-	GVariant* _tmp8_;
-	GAction* _tmp9_;
-	gboolean _tmp10_;
+	GVariant* _tmp7_;
+	GAction* _tmp8_;
+	GVariant* _tmp9_;
+	GAction* _tmp10_;
 	GVariant* _tmp11_;
-	GAction* _tmp12_;
-	gboolean _tmp13_;
-	GVariant* _tmp14_;
 #line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2538,62 +3057,62 @@ static void library_window_real_add_actions (AppWindow* base) {
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp7_ = _variant_new1 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = _variant_new1 (_tmp7_);
+	g_action_change_state (_tmp4_, _tmp7_);
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp4_, _tmp8_);
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp8_);
+	_g_variant_unref0 (_tmp7_);
 #line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar");
+	_tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySidebar");
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = library_window_is_sidebar_visible (self);
+	_tmp9_ = _variant_new2 (library_window_is_sidebar_visible (self));
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = _variant_new2 (_tmp10_);
+	g_action_change_state (_tmp8_, _tmp9_);
 #line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp9_, _tmp11_);
-#line 299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp11_);
+	_g_variant_unref0 (_tmp9_);
 #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar");
+	_tmp10_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayToolbar");
 #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = library_window_is_toolbar_visible (self);
+	_tmp11_ = _variant_new3 (library_window_is_toolbar_visible (self));
 #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = _variant_new3 (_tmp13_);
+	g_action_change_state (_tmp10_, _tmp11_);
 #line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp12_, _tmp14_);
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp14_);
-#line 2571 "LibraryWindow.c"
+	_g_variant_unref0 (_tmp11_);
+#line 3084 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
+static void
+_library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender,
+                                                                                ViewFilter* filer,
+                                                                                gpointer self)
+{
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
-#line 2578 "LibraryWindow.c"
+#line 3095 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
+static void
+_library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender,
+                                                                            ViewFilter* filer,
+                                                                            gpointer self)
+{
 #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
-#line 2585 "LibraryWindow.c"
+#line 3106 "LibraryWindow.c"
 }
 
 
-static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page) {
+static void
+library_window_real_switched_pages (PageWindow* base,
+                                    Page* old_page,
+                                    Page* new_page)
+{
 	LibraryWindow * self;
-	Page* _tmp0_;
-	Page* _tmp1_;
-	Page* _tmp2_;
-	Page* _tmp11_;
-	SearchFilterActions* _tmp18_;
-	Page* _tmp19_;
-	Page* _tmp20_;
+	SearchFilterActions* _tmp10_;
 #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2601,158 +3120,142 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 #line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = old_page;
-#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = new_page;
-#line 304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp0_, _tmp1_);
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = old_page;
+	PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), old_page, new_page);
 #line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_ != NULL) {
-#line 2614 "LibraryWindow.c"
-		Page* _tmp3_;
+	if (old_page != NULL) {
+#line 3127 "LibraryWindow.c"
+		ViewCollection* _tmp0_;
+		ViewCollection* _tmp1_;
+		guint _tmp2_;
+		ViewCollection* _tmp3_;
 		ViewCollection* _tmp4_;
-		ViewCollection* _tmp5_;
-		guint _tmp6_;
-		Page* _tmp7_;
-		ViewCollection* _tmp8_;
-		ViewCollection* _tmp9_;
-		guint _tmp10_;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = old_page;
+		guint _tmp5_;
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = page_get_view (_tmp3_);
+		_tmp0_ = page_get_view (old_page);
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = _tmp4_;
+		_tmp1_ = _tmp0_;
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
+		g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self);
+		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self);
 #line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp5_);
+		_data_collection_unref0 (_tmp1_);
 #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = old_page;
+		_tmp3_ = page_get_view (old_page);
 #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = page_get_view (_tmp7_);
+		_tmp4_ = _tmp3_;
 #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = _tmp8_;
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
+		g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
 #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self);
+		g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self);
 #line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp9_);
-#line 2647 "LibraryWindow.c"
+		_data_collection_unref0 (_tmp4_);
+#line 3154 "LibraryWindow.c"
 	}
 #line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = new_page;
-#line 312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp11_ != NULL) {
-#line 2653 "LibraryWindow.c"
-		Page* _tmp12_;
-		ViewCollection* _tmp13_;
-		ViewCollection* _tmp14_;
-		Page* _tmp15_;
-		ViewCollection* _tmp16_;
-		ViewCollection* _tmp17_;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = new_page;
+	if (new_page != NULL) {
+#line 3158 "LibraryWindow.c"
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		ViewCollection* _tmp9_;
 #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = page_get_view (_tmp12_);
+		_tmp6_ = page_get_view (new_page);
 #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = _tmp13_;
+		_tmp7_ = _tmp6_;
 #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_signal_connect_object (_tmp14_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0);
+		g_signal_connect_object (_tmp7_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0);
 #line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp14_);
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = new_page;
+		_data_collection_unref0 (_tmp7_);
 #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = page_get_view (_tmp15_);
+		_tmp8_ = page_get_view (new_page);
 #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = _tmp16_;
+		_tmp9_ = _tmp8_;
 #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
+		g_signal_connect_object (_tmp9_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
 #line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp17_);
-#line 2680 "LibraryWindow.c"
+		_data_collection_unref0 (_tmp9_);
+#line 3179 "LibraryWindow.c"
 	}
 #line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = self->priv->search_actions;
+	_tmp10_ = self->priv->search_actions;
 #line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = old_page;
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = new_page;
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_);
-#line 2690 "LibraryWindow.c"
+	search_filter_actions_monitor_page_contents (_tmp10_, old_page, new_page);
+#line 3185 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) {
+static void
+_library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender,
+                                                              gpointer self)
+{
 #line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_refreshed ((LibraryWindow*) self);
-#line 2697 "LibraryWindow.c"
+#line 3195 "LibraryWindow.c"
 }
 
 
-static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) {
-	ViewFilter* _tmp0_;
+static void
+library_window_on_view_filter_installed (LibraryWindow* self,
+                                         ViewFilter* filter)
+{
 #line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = filter;
-#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0);
-#line 2711 "LibraryWindow.c"
+	g_signal_connect_object (filter, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0);
+#line 3209 "LibraryWindow.c"
 }
 
 
-static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) {
-	ViewFilter* _tmp0_;
-	guint _tmp1_;
+static void
+library_window_on_view_filter_removed (LibraryWindow* self,
+                                       ViewFilter* filter)
+{
+	guint _tmp0_;
 #line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
 #line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = filter;
+	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp0_, NULL, FALSE);
 #line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self);
-#line 2728 "LibraryWindow.c"
+	g_signal_handlers_disconnect_matched (filter, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self);
+#line 3226 "LibraryWindow.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2735 "LibraryWindow.c"
+#line 3235 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new4 (gboolean value) {
+static GVariant*
+_variant_new4 (gboolean value)
+{
 #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 2742 "LibraryWindow.c"
+#line 3244 "LibraryWindow.c"
 }
 
 
-static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
+static void
+library_window_on_view_filter_refreshed (LibraryWindow* self)
+{
 	Page* _tmp0_;
 	Page* _tmp1_;
 	ViewCollection* _tmp2_;
 	ViewCollection* _tmp3_;
 	gboolean _tmp4_;
-	gboolean _tmp5_;
 	GAction* action = NULL;
+	GAction* _tmp5_;
 	GAction* _tmp6_;
 	GAction* _tmp7_;
-	GAction* _tmp8_;
 #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2764,49 +3267,49 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = view_collection_are_items_filtered_out (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = !_tmp4_;
+	_tmp4_ = !view_collection_are_items_filtered_out (_tmp3_);
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp3_);
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
 #line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp5_) {
+	if (_tmp4_) {
 #line 332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 2779 "LibraryWindow.c"
+#line 3280 "LibraryWindow.c"
 	}
 #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+	_tmp5_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
 #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _g_object_ref0 (_tmp6_);
+	_tmp6_ = _g_object_ref0 (_tmp5_);
 #line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	action = _tmp7_;
+	action = _tmp6_;
 #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = action;
+	_tmp7_ = action;
 #line 337 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp8_ != NULL) {
-#line 2791 "LibraryWindow.c"
-		GAction* _tmp9_;
-		GVariant* _tmp10_;
+	if (_tmp7_ != NULL) {
+#line 3292 "LibraryWindow.c"
+		GAction* _tmp8_;
+		GVariant* _tmp9_;
 #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = action;
+		_tmp8_ = action;
 #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = _variant_new4 (TRUE);
+		_tmp9_ = _variant_new4 (TRUE);
 #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_action_change_state (_tmp9_, _tmp10_);
+		g_action_change_state (_tmp8_, _tmp9_);
 #line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_variant_unref0 (_tmp10_);
-#line 2802 "LibraryWindow.c"
+		_g_variant_unref0 (_tmp9_);
+#line 3303 "LibraryWindow.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 2806 "LibraryWindow.c"
+#line 3307 "LibraryWindow.c"
 }
 
 
-static void library_window_real_show_all (GtkWidget* base) {
+static void
+library_window_real_show_all (GtkWidget* base)
+{
 	LibraryWindow * self;
 	GAction* basic_properties_action = NULL;
 	Page* _tmp0_;
@@ -2818,14 +3321,11 @@ static void library_window_real_show_all (GtkWidget* base) {
 	GVariant* _tmp6_;
 	GVariant* _tmp7_;
 	gboolean _tmp8_;
-	gboolean _tmp9_;
 	CheckerboardPage* current_page = NULL;
-	Page* _tmp11_;
+	Page* _tmp10_;
+	CheckerboardPage* _tmp11_;
 	CheckerboardPage* _tmp12_;
-	CheckerboardPage* _tmp13_;
-	gboolean _tmp15_;
-	CheckerboardPage* _tmp16_;
-	gboolean _tmp17_;
+	CheckerboardPage* _tmp14_;
 #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2853,64 +3353,60 @@ static void library_window_real_show_all (GtkWidget* base) {
 #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
 #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = g_variant_get_boolean (_tmp7_);
-#line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = !_tmp8_;
+	_tmp8_ = !g_variant_get_boolean (_tmp7_);
 #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (_tmp7_);
 #line 349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp9_) {
-#line 2864 "LibraryWindow.c"
-		GtkFrame* _tmp10_;
+	if (_tmp8_) {
+#line 3362 "LibraryWindow.c"
+		GtkFrame* _tmp9_;
 #line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = self->priv->bottom_frame;
+		_tmp9_ = self->priv->bottom_frame;
 #line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2870 "LibraryWindow.c"
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 3368 "LibraryWindow.c"
 	}
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp10_) : NULL;
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp12_ == NULL) {
+	if (_tmp11_ == NULL) {
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp11_);
-#line 2880 "LibraryWindow.c"
+		_g_object_unref0 (_tmp10_);
+#line 3378 "LibraryWindow.c"
 	}
 #line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp12_;
+	current_page = _tmp11_;
 #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = current_page;
+	_tmp12_ = current_page;
 #line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp13_ != NULL) {
-#line 2888 "LibraryWindow.c"
-		CheckerboardPage* _tmp14_;
+	if (_tmp12_ != NULL) {
+#line 3386 "LibraryWindow.c"
+		CheckerboardPage* _tmp13_;
 #line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = current_page;
+		_tmp13_ = current_page;
 #line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_init_view_filter (self, _tmp14_);
-#line 2894 "LibraryWindow.c"
+		library_window_init_view_filter (self, _tmp13_);
+#line 3392 "LibraryWindow.c"
 	}
 #line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = library_window_should_show_search_bar (self);
-#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = current_page;
+	_tmp14_ = current_page;
 #line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_toggle_search_bar (self, _tmp15_, _tmp16_);
+	library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp14_);
 #line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = library_window_is_sidebar_visible (self);
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_set_sidebar_visible (self, _tmp17_);
+	library_window_set_sidebar_visible (self, library_window_is_sidebar_visible (self));
 #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
 #line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_properties_action);
-#line 2910 "LibraryWindow.c"
+#line 3404 "LibraryWindow.c"
 }
 
 
-LibraryWindow* library_window_get_app (void) {
+LibraryWindow*
+library_window_get_app (void)
+{
 	LibraryWindow* result = NULL;
 	AppWindow* _tmp0_;
 	AppWindow* _tmp1_;
@@ -2927,15 +3423,17 @@ LibraryWindow* library_window_get_app (void) {
 	result = _tmp2_;
 #line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2931 "LibraryWindow.c"
+#line 3427 "LibraryWindow.c"
 }
 
 
-gboolean library_window_is_mount_uri_supported (const gchar* uri) {
+gboolean
+library_window_is_mount_uri_supported (const gchar* uri)
+{
 	gboolean result = FALSE;
 #line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (uri != NULL, FALSE);
-#line 2939 "LibraryWindow.c"
+#line 3437 "LibraryWindow.c"
 	{
 		const gchar** scheme_collection = NULL;
 		gint scheme_collection_length1 = 0;
@@ -2947,37 +3445,31 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 		scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
 #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) {
-#line 2951 "LibraryWindow.c"
+#line 3449 "LibraryWindow.c"
 			gchar* _tmp0_;
 			gchar* scheme = NULL;
 #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
 #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			scheme = _tmp0_;
-#line 2958 "LibraryWindow.c"
+#line 3456 "LibraryWindow.c"
 			{
 				const gchar* _tmp1_;
-				const gchar* _tmp2_;
-				gboolean _tmp3_;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp1_ = uri;
 #line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp2_ = scheme;
+				_tmp1_ = scheme;
 #line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_);
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				if (_tmp3_) {
+				if (g_str_has_prefix (uri, _tmp1_)) {
 #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					result = TRUE;
 #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (scheme);
 #line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					return result;
-#line 2977 "LibraryWindow.c"
+#line 3469 "LibraryWindow.c"
 				}
 #line 371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (scheme);
-#line 2981 "LibraryWindow.c"
+#line 3473 "LibraryWindow.c"
 			}
 		}
 	}
@@ -2985,11 +3477,13 @@ gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 	result = FALSE;
 #line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 2989 "LibraryWindow.c"
+#line 3481 "LibraryWindow.c"
 }
 
 
-static gchar* library_window_real_get_app_role (AppWindow* base) {
+static gchar*
+library_window_real_get_app_role (AppWindow* base)
+{
 	LibraryWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -3001,16 +3495,18 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
 	result = _tmp0_;
 #line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3005 "LibraryWindow.c"
+#line 3499 "LibraryWindow.c"
 }
 
 
-void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
+void
+library_window_rename_tag_in_sidebar (LibraryWindow* self,
+                                      Tag* tag)
+{
 	TagsSidebarEntry* entry = NULL;
 	TagsBranch* _tmp0_;
-	Tag* _tmp1_;
+	TagsSidebarEntry* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
-	TagsSidebarEntry* _tmp3_;
 #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3018,42 +3514,42 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = tag;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
+	_tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag);
 #line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = entry;
+	_tmp2_ = entry;
 #line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ != NULL) {
-#line 3031 "LibraryWindow.c"
-		SidebarTree* _tmp4_;
-		TagsSidebarEntry* _tmp5_;
+	if (_tmp2_ != NULL) {
+#line 3525 "LibraryWindow.c"
+		SidebarTree* _tmp3_;
+		TagsSidebarEntry* _tmp4_;
 #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = self->priv->sidebar_tree;
+		_tmp3_ = self->priv->sidebar_tree;
 #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = entry;
+		_tmp4_ = entry;
 #line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3040 "LibraryWindow.c"
+		sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3534 "LibraryWindow.c"
 	} else {
 #line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:388: No tag entry found for rename");
-#line 3044 "LibraryWindow.c"
+#line 3538 "LibraryWindow.c"
 	}
 #line 383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3048 "LibraryWindow.c"
+#line 3542 "LibraryWindow.c"
 }
 
 
-void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event) {
+void
+library_window_rename_event_in_sidebar (LibraryWindow* self,
+                                        Event* event)
+{
 	EventsEventEntry* entry = NULL;
 	EventsBranch* _tmp0_;
-	Event* _tmp1_;
+	EventsEventEntry* _tmp1_;
 	EventsEventEntry* _tmp2_;
-	EventsEventEntry* _tmp3_;
 #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3061,42 +3557,42 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = event;
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
+	_tmp1_ = events_branch_get_entry_for_event (_tmp0_, event);
 #line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = entry;
+	_tmp2_ = entry;
 #line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ != NULL) {
-#line 3074 "LibraryWindow.c"
-		SidebarTree* _tmp4_;
-		EventsEventEntry* _tmp5_;
+	if (_tmp2_ != NULL) {
+#line 3568 "LibraryWindow.c"
+		SidebarTree* _tmp3_;
+		EventsEventEntry* _tmp4_;
 #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = self->priv->sidebar_tree;
+		_tmp3_ = self->priv->sidebar_tree;
 #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = entry;
+		_tmp4_ = entry;
 #line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3083 "LibraryWindow.c"
+		sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3577 "LibraryWindow.c"
 	} else {
 #line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:396: No event entry found for rename");
-#line 3087 "LibraryWindow.c"
+#line 3581 "LibraryWindow.c"
 	}
 #line 391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3091 "LibraryWindow.c"
+#line 3585 "LibraryWindow.c"
 }
 
 
-void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search) {
+void
+library_window_rename_search_in_sidebar (LibraryWindow* self,
+                                         SavedSearch* search)
+{
 	SearchesSidebarEntry* entry = NULL;
 	SearchesBranch* _tmp0_;
-	SavedSearch* _tmp1_;
+	SearchesSidebarEntry* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
-	SearchesSidebarEntry* _tmp3_;
 #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3104,37 +3600,37 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
 #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = search;
+	_tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search);
 #line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = entry;
+	_tmp2_ = entry;
 #line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ != NULL) {
-#line 3117 "LibraryWindow.c"
-		SidebarTree* _tmp4_;
-		SearchesSidebarEntry* _tmp5_;
+	if (_tmp2_ != NULL) {
+#line 3611 "LibraryWindow.c"
+		SidebarTree* _tmp3_;
+		SearchesSidebarEntry* _tmp4_;
 #line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = self->priv->sidebar_tree;
+		_tmp3_ = self->priv->sidebar_tree;
 #line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = entry;
+		_tmp4_ = entry;
 #line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 3126 "LibraryWindow.c"
+		sidebar_tree_rename_entry_in_place (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
+#line 3620 "LibraryWindow.c"
 	} else {
 #line 404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:404: No search entry found for rename");
-#line 3130 "LibraryWindow.c"
+#line 3624 "LibraryWindow.c"
 	}
 #line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 3134 "LibraryWindow.c"
+#line 3628 "LibraryWindow.c"
 }
 
 
-static void library_window_real_on_quit (AppWindow* base) {
+static void
+library_window_real_on_quit (AppWindow* base)
+{
 	LibraryWindow * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
@@ -3175,133 +3671,133 @@ static void library_window_real_on_quit (AppWindow* base) {
 	_g_object_unref0 (_tmp5_);
 #line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 3179 "LibraryWindow.c"
+#line 3675 "LibraryWindow.c"
 }
 
 
-static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, CollectionPage* page) {
+static Photo*
+library_window_get_start_fullscreen_photo (LibraryWindow* self,
+                                           CollectionPage* page)
+{
 	Photo* result = NULL;
 	ViewCollection* view = NULL;
-	CollectionPage* _tmp0_;
-	ViewCollection* _tmp1_;
-	GeeList* _tmp2_ = NULL;
-	ViewCollection* _tmp3_;
-	gint _tmp4_;
+	ViewCollection* _tmp0_;
+	GeeList* _tmp1_ = NULL;
+	ViewCollection* _tmp2_;
 	GeeList* sources = NULL;
-	GeeList* _tmp9_;
-	Photo* _tmp10_ = NULL;
-	gboolean _tmp11_ = FALSE;
-	GeeList* _tmp12_;
+	GeeList* _tmp7_;
+	Photo* _tmp8_ = NULL;
+	gboolean _tmp9_ = FALSE;
+	GeeList* _tmp10_;
 #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
 #line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
 #line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
+	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
 #line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = _tmp1_;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = view;
+	view = _tmp0_;
 #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = view_collection_get_selected_count (_tmp3_);
+	_tmp2_ = view;
 #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp4_ > 0) {
-#line 3212 "LibraryWindow.c"
-		ViewCollection* _tmp5_;
-		GeeList* _tmp6_;
+	if (view_collection_get_selected_count (_tmp2_) > 0) {
+#line 3705 "LibraryWindow.c"
+		ViewCollection* _tmp3_;
+		GeeList* _tmp4_;
 #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = view;
+		_tmp3_ = view;
 #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
+		_tmp4_ = view_collection_get_selected_sources_of_type (_tmp3_, TYPE_LIBRARY_PHOTO);
 #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_object_unref0 (_tmp1_);
 #line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = _tmp6_;
-#line 3223 "LibraryWindow.c"
+		_tmp1_ = _tmp4_;
+#line 3716 "LibraryWindow.c"
 	} else {
-		ViewCollection* _tmp7_;
-		GeeList* _tmp8_;
+		ViewCollection* _tmp5_;
+		GeeList* _tmp6_;
 #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = view;
+		_tmp5_ = view;
 #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO);
+		_tmp6_ = view_collection_get_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
 #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_object_unref0 (_tmp1_);
 #line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = _tmp8_;
-#line 3235 "LibraryWindow.c"
+		_tmp1_ = _tmp6_;
+#line 3728 "LibraryWindow.c"
 	}
 #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = _g_object_ref0 (_tmp2_);
+	_tmp7_ = _g_object_ref0 (_tmp1_);
 #line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sources = _tmp9_;
+	sources = _tmp7_;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = sources;
+	_tmp10_ = sources;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp12_ != NULL) {
-#line 3245 "LibraryWindow.c"
-		GeeList* _tmp13_;
-		gint _tmp14_;
-		gint _tmp15_;
+	if (_tmp10_ != NULL) {
+#line 3738 "LibraryWindow.c"
+		GeeList* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = sources;
+		_tmp11_ = sources;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = _tmp14_;
+		_tmp13_ = _tmp12_;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = _tmp15_ != 0;
-#line 3257 "LibraryWindow.c"
+		_tmp9_ = _tmp13_ != 0;
+#line 3750 "LibraryWindow.c"
 	} else {
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = FALSE;
-#line 3261 "LibraryWindow.c"
+		_tmp9_ = FALSE;
+#line 3754 "LibraryWindow.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp11_) {
-#line 3265 "LibraryWindow.c"
-		GeeList* _tmp16_;
-		gpointer _tmp17_;
+	if (_tmp9_) {
+#line 3758 "LibraryWindow.c"
+		GeeList* _tmp14_;
+		gpointer _tmp15_;
 #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = sources;
+		_tmp14_ = sources;
 #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = gee_list_get (_tmp16_, 0);
+		_tmp15_ = gee_list_get (_tmp14_, 0);
 #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp10_);
+		_g_object_unref0 (_tmp8_);
 #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo);
-#line 3276 "LibraryWindow.c"
+		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp15_, TYPE_PHOTO, Photo);
+#line 3769 "LibraryWindow.c"
 	} else {
 #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp10_);
+		_g_object_unref0 (_tmp8_);
 #line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = NULL;
-#line 3282 "LibraryWindow.c"
+		_tmp8_ = NULL;
+#line 3775 "LibraryWindow.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	result = _tmp10_;
+	result = _tmp8_;
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sources);
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
 #line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3294 "LibraryWindow.c"
+#line 3787 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page* page, CollectionPage* * collection, Photo* * start, ViewCollection* * view_collection) {
+static gboolean
+library_window_get_fullscreen_photo (LibraryWindow* self,
+                                     Page* page,
+                                     CollectionPage* * collection,
+                                     Photo* * start,
+                                     ViewCollection* * view_collection)
+{
 	CollectionPage* _vala_collection = NULL;
 	Photo* _vala_start = NULL;
 	ViewCollection* _vala_view_collection = NULL;
 	gboolean result = FALSE;
-	Page* _tmp0_;
-	Page* _tmp8_;
-	Page* _tmp30_;
 #line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3319,36 +3815,31 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 #line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_view_collection = NULL;
 #line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
-#line 3326 "LibraryWindow.c"
-		Page* _tmp1_;
-		CollectionPage* _tmp2_;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_COLLECTION_PAGE)) {
+#line 3820 "LibraryWindow.c"
+		CollectionPage* _tmp0_;
 		Photo* photo = NULL;
-		CollectionPage* _tmp3_;
+		CollectionPage* _tmp1_;
+		Photo* _tmp2_;
+		Photo* _tmp3_;
 		Photo* _tmp4_;
 		Photo* _tmp5_;
-		Photo* _tmp6_;
-		Photo* _tmp7_;
-#line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = page;
 #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage));
+		_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
 #line 436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp2_;
+		_vala_collection = _tmp0_;
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = _vala_collection;
+		_tmp1_ = _vala_collection;
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_);
+		_tmp2_ = library_window_get_start_fullscreen_photo (self, _tmp1_);
 #line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp4_;
+		photo = _tmp2_;
 #line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = photo;
+		_tmp3_ = photo;
 #line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp5_ == NULL) {
+		if (_tmp3_ == NULL) {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3357,44 +3848,44 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3361 "LibraryWindow.c"
+#line 3852 "LibraryWindow.c"
 			} else {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3365 "LibraryWindow.c"
+#line 3856 "LibraryWindow.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3371 "LibraryWindow.c"
+#line 3862 "LibraryWindow.c"
 			} else {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3375 "LibraryWindow.c"
+#line 3866 "LibraryWindow.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3381 "LibraryWindow.c"
+#line 3872 "LibraryWindow.c"
 			} else {
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3385 "LibraryWindow.c"
+#line 3876 "LibraryWindow.c"
 			}
 #line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3389 "LibraryWindow.c"
+#line 3880 "LibraryWindow.c"
 		}
 #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = photo;
+		_tmp4_ = photo;
 #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = _g_object_ref0 (_tmp6_);
+		_tmp5_ = _g_object_ref0 (_tmp4_);
 #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
 #line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp7_;
+		_vala_start = _tmp5_;
 #line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
 #line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3407,78 +3898,70 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		if (collection) {
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3411 "LibraryWindow.c"
+#line 3902 "LibraryWindow.c"
 		} else {
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3415 "LibraryWindow.c"
+#line 3906 "LibraryWindow.c"
 		}
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3421 "LibraryWindow.c"
+#line 3912 "LibraryWindow.c"
 		} else {
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3425 "LibraryWindow.c"
+#line 3916 "LibraryWindow.c"
 		}
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3431 "LibraryWindow.c"
+#line 3922 "LibraryWindow.c"
 		} else {
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3435 "LibraryWindow.c"
+#line 3926 "LibraryWindow.c"
 		}
 #line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3439 "LibraryWindow.c"
+#line 3930 "LibraryWindow.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = page;
-#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 3445 "LibraryWindow.c"
+	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_EVENTS_DIRECTORY_PAGE)) {
+#line 3934 "LibraryWindow.c"
 		ViewCollection* view = NULL;
-		Page* _tmp9_;
-		ViewCollection* _tmp10_;
-		ViewCollection* _tmp11_;
-		gint _tmp12_;
+		ViewCollection* _tmp6_;
+		ViewCollection* _tmp7_;
 		Event* event = NULL;
-		ViewCollection* _tmp13_;
-		DataObject* _tmp14_;
-		DataView* _tmp15_;
-		DataSource* _tmp16_;
-		Event* _tmp17_;
-		Event* _tmp18_;
+		ViewCollection* _tmp8_;
+		DataObject* _tmp9_;
+		DataView* _tmp10_;
+		DataSource* _tmp11_;
+		Event* _tmp12_;
+		Event* _tmp13_;
 		EventsEventEntry* entry = NULL;
-		EventsBranch* _tmp19_;
-		Event* _tmp20_;
-		EventsEventEntry* _tmp21_;
-		EventsEventEntry* _tmp22_;
-		EventsEventEntry* _tmp23_;
-		Page* _tmp24_;
+		EventsBranch* _tmp14_;
+		Event* _tmp15_;
+		EventsEventEntry* _tmp16_;
+		EventsEventEntry* _tmp17_;
+		EventsEventEntry* _tmp18_;
+		Page* _tmp19_;
 		Photo* photo = NULL;
-		CollectionPage* _tmp25_;
-		Photo* _tmp26_;
-		Photo* _tmp27_;
-		Photo* _tmp28_;
-		Photo* _tmp29_;
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = page;
+		CollectionPage* _tmp20_;
+		Photo* _tmp21_;
+		Photo* _tmp22_;
+		Photo* _tmp23_;
+		Photo* _tmp24_;
 #line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = page_get_view (_tmp9_);
+		_tmp6_ = page_get_view (page);
 #line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		view = _tmp10_;
+		view = _tmp6_;
 #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = view;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
+		_tmp7_ = view;
 #line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp12_ == 0) {
+		if (data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection)) == 0) {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3487,54 +3970,54 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3491 "LibraryWindow.c"
+#line 3974 "LibraryWindow.c"
 			} else {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3495 "LibraryWindow.c"
+#line 3978 "LibraryWindow.c"
 			}
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3501 "LibraryWindow.c"
+#line 3984 "LibraryWindow.c"
 			} else {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3505 "LibraryWindow.c"
+#line 3988 "LibraryWindow.c"
 			}
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3511 "LibraryWindow.c"
+#line 3994 "LibraryWindow.c"
 			} else {
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3515 "LibraryWindow.c"
+#line 3998 "LibraryWindow.c"
 			}
 #line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3519 "LibraryWindow.c"
+#line 4002 "LibraryWindow.c"
 		}
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = view;
+		_tmp8_ = view;
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), 0);
+		_tmp9_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), 0);
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView);
+		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_VIEW, DataView);
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = data_view_get_source (_tmp15_);
+		_tmp11_ = data_view_get_source (_tmp10_);
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event);
+		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_EVENT, Event);
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp15_);
+		_g_object_unref0 (_tmp10_);
 #line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		event = _tmp17_;
+		event = _tmp12_;
 #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp18_ = event;
+		_tmp13_ = event;
 #line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp18_ == NULL) {
+		if (_tmp13_ == NULL) {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3545,48 +4028,48 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3549 "LibraryWindow.c"
+#line 4032 "LibraryWindow.c"
 			} else {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3553 "LibraryWindow.c"
+#line 4036 "LibraryWindow.c"
 			}
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3559 "LibraryWindow.c"
+#line 4042 "LibraryWindow.c"
 			} else {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3563 "LibraryWindow.c"
+#line 4046 "LibraryWindow.c"
 			}
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3569 "LibraryWindow.c"
+#line 4052 "LibraryWindow.c"
 			} else {
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3573 "LibraryWindow.c"
+#line 4056 "LibraryWindow.c"
 			}
 #line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3577 "LibraryWindow.c"
+#line 4060 "LibraryWindow.c"
 		}
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp19_ = self->priv->events_branch;
+		_tmp14_ = self->priv->events_branch;
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp20_ = event;
+		_tmp15_ = event;
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_);
+		_tmp16_ = events_branch_get_entry_for_event (_tmp14_, _tmp15_);
 #line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		entry = _tmp21_;
+		entry = _tmp16_;
 #line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp22_ = entry;
+		_tmp17_ = entry;
 #line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp22_ == NULL) {
+		if (_tmp17_ == NULL) {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3599,54 +4082,54 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3603 "LibraryWindow.c"
+#line 4086 "LibraryWindow.c"
 			} else {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3607 "LibraryWindow.c"
+#line 4090 "LibraryWindow.c"
 			}
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3613 "LibraryWindow.c"
+#line 4096 "LibraryWindow.c"
 			} else {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3617 "LibraryWindow.c"
+#line 4100 "LibraryWindow.c"
 			}
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3623 "LibraryWindow.c"
+#line 4106 "LibraryWindow.c"
 			} else {
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3627 "LibraryWindow.c"
+#line 4110 "LibraryWindow.c"
 			}
 #line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3631 "LibraryWindow.c"
+#line 4114 "LibraryWindow.c"
 		}
 #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp23_ = entry;
+		_tmp18_ = entry;
 #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp24_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
 #line 460 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
+		_vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp25_ = _vala_collection;
+		_tmp20_ = _vala_collection;
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_);
+		_tmp21_ = library_window_get_start_fullscreen_photo (self, _tmp20_);
 #line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo = _tmp26_;
+		photo = _tmp21_;
 #line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp27_ = photo;
+		_tmp22_ = photo;
 #line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp27_ == NULL) {
+		if (_tmp22_ == NULL) {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3661,44 +4144,44 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3665 "LibraryWindow.c"
+#line 4148 "LibraryWindow.c"
 			} else {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3669 "LibraryWindow.c"
+#line 4152 "LibraryWindow.c"
 			}
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3675 "LibraryWindow.c"
+#line 4158 "LibraryWindow.c"
 			} else {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3679 "LibraryWindow.c"
+#line 4162 "LibraryWindow.c"
 			}
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3685 "LibraryWindow.c"
+#line 4168 "LibraryWindow.c"
 			} else {
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3689 "LibraryWindow.c"
+#line 4172 "LibraryWindow.c"
 			}
 #line 463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3693 "LibraryWindow.c"
+#line 4176 "LibraryWindow.c"
 		}
 #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp28_ = photo;
+		_tmp23_ = photo;
 #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp29_ = _g_object_ref0 (_tmp28_);
+		_tmp24_ = _g_object_ref0 (_tmp23_);
 #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
 #line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp29_;
+		_vala_start = _tmp24_;
 #line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
 #line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3717,72 +4200,66 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		if (collection) {
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3721 "LibraryWindow.c"
+#line 4204 "LibraryWindow.c"
 		} else {
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3725 "LibraryWindow.c"
+#line 4208 "LibraryWindow.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3731 "LibraryWindow.c"
+#line 4214 "LibraryWindow.c"
 		} else {
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3735 "LibraryWindow.c"
+#line 4218 "LibraryWindow.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3741 "LibraryWindow.c"
+#line 4224 "LibraryWindow.c"
 		} else {
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3745 "LibraryWindow.c"
+#line 4228 "LibraryWindow.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3749 "LibraryWindow.c"
+#line 4232 "LibraryWindow.c"
 	}
 #line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = page;
-#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 3755 "LibraryWindow.c"
+	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) {
+#line 4236 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
-		Page* _tmp31_;
-		LibraryPhotoPage* _tmp32_;
+		LibraryPhotoPage* _tmp25_;
 		CollectionPage* controller = NULL;
-		LibraryPhotoPage* _tmp33_;
-		CollectionPage* _tmp34_;
-		CollectionPage* _tmp35_;
-		LibraryPhotoPage* _tmp36_;
-		gboolean _tmp37_;
-		CollectionPage* _tmp38_;
-		CollectionPage* _tmp39_;
-		LibraryPhotoPage* _tmp40_;
-		Photo* _tmp41_;
-		LibraryPhotoPage* _tmp42_;
-		ViewCollection* _tmp43_;
-#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp31_ = page;
+		LibraryPhotoPage* _tmp26_;
+		CollectionPage* _tmp27_;
+		CollectionPage* _tmp28_;
+		LibraryPhotoPage* _tmp29_;
+		CollectionPage* _tmp30_;
+		CollectionPage* _tmp31_;
+		LibraryPhotoPage* _tmp32_;
+		Photo* _tmp33_;
+		LibraryPhotoPage* _tmp34_;
+		ViewCollection* _tmp35_;
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
+		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
 #line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		photo_page = _tmp32_;
+		photo_page = _tmp25_;
 #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp33_ = photo_page;
+		_tmp26_ = photo_page;
 #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp34_ = library_photo_page_get_controller_page (_tmp33_);
+		_tmp27_ = library_photo_page_get_controller_page (_tmp26_);
 #line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		controller = _tmp34_;
+		controller = _tmp27_;
 #line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp35_ = controller;
+		_tmp28_ = controller;
 #line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp35_ == NULL) {
+		if (_tmp28_ == NULL) {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3793,42 +4270,40 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3797 "LibraryWindow.c"
+#line 4274 "LibraryWindow.c"
 			} else {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3801 "LibraryWindow.c"
+#line 4278 "LibraryWindow.c"
 			}
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3807 "LibraryWindow.c"
+#line 4284 "LibraryWindow.c"
 			} else {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3811 "LibraryWindow.c"
+#line 4288 "LibraryWindow.c"
 			}
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3817 "LibraryWindow.c"
+#line 4294 "LibraryWindow.c"
 			} else {
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3821 "LibraryWindow.c"
+#line 4298 "LibraryWindow.c"
 			}
 #line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3825 "LibraryWindow.c"
+#line 4302 "LibraryWindow.c"
 		}
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp36_ = photo_page;
-#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp37_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp29_ = photo_page;
 #line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (!_tmp37_) {
+		if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3839,60 +4314,60 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 			if (collection) {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 3843 "LibraryWindow.c"
+#line 4318 "LibraryWindow.c"
 			} else {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 3847 "LibraryWindow.c"
+#line 4322 "LibraryWindow.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 3853 "LibraryWindow.c"
+#line 4328 "LibraryWindow.c"
 			} else {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 3857 "LibraryWindow.c"
+#line 4332 "LibraryWindow.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 3863 "LibraryWindow.c"
+#line 4338 "LibraryWindow.c"
 			} else {
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 3867 "LibraryWindow.c"
+#line 4342 "LibraryWindow.c"
 			}
 #line 479 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 3871 "LibraryWindow.c"
+#line 4346 "LibraryWindow.c"
 		}
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp38_ = controller;
+		_tmp30_ = controller;
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp39_ = _g_object_ref0 (_tmp38_);
+		_tmp31_ = _g_object_ref0 (_tmp30_);
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
 #line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_collection = _tmp39_;
+		_vala_collection = _tmp31_;
 #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp40_ = photo_page;
+		_tmp32_ = photo_page;
 #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp41_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp33_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
 #line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_start = _tmp41_;
+		_vala_start = _tmp33_;
 #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp42_ = photo_page;
+		_tmp34_ = photo_page;
 #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page));
+		_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PAGE, Page));
 #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
 #line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_view_collection = _tmp43_;
+		_vala_view_collection = _tmp35_;
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3903,35 +4378,35 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		if (collection) {
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 3907 "LibraryWindow.c"
+#line 4382 "LibraryWindow.c"
 		} else {
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 3911 "LibraryWindow.c"
+#line 4386 "LibraryWindow.c"
 		}
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 3917 "LibraryWindow.c"
+#line 4392 "LibraryWindow.c"
 		} else {
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 3921 "LibraryWindow.c"
+#line 4396 "LibraryWindow.c"
 		}
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 3927 "LibraryWindow.c"
+#line 4402 "LibraryWindow.c"
 		} else {
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 3931 "LibraryWindow.c"
+#line 4406 "LibraryWindow.c"
 		}
 #line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 3935 "LibraryWindow.c"
+#line 4410 "LibraryWindow.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
@@ -3939,39 +4414,41 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	if (collection) {
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*collection = _vala_collection;
-#line 3943 "LibraryWindow.c"
+#line 4418 "LibraryWindow.c"
 	} else {
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 3947 "LibraryWindow.c"
+#line 4422 "LibraryWindow.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (start) {
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*start = _vala_start;
-#line 3953 "LibraryWindow.c"
+#line 4428 "LibraryWindow.c"
 	} else {
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 3957 "LibraryWindow.c"
+#line 4432 "LibraryWindow.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection) {
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*view_collection = _vala_view_collection;
-#line 3963 "LibraryWindow.c"
+#line 4438 "LibraryWindow.c"
 	} else {
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 3967 "LibraryWindow.c"
+#line 4442 "LibraryWindow.c"
 	}
 #line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 3971 "LibraryWindow.c"
+#line 4446 "LibraryWindow.c"
 }
 
 
-static void library_window_real_on_fullscreen (AppWindow* base) {
+static void
+library_window_real_on_fullscreen (AppWindow* base)
+{
 	LibraryWindow * self;
 	Page* current_page = NULL;
 	Page* _tmp0_;
@@ -4004,7 +4481,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 		_g_object_unref0 (current_page);
 #line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4008 "LibraryWindow.c"
+#line 4485 "LibraryWindow.c"
 	}
 #line 498 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = NULL;
@@ -4036,7 +4513,7 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 		_g_object_unref0 (current_page);
 #line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4040 "LibraryWindow.c"
+#line 4517 "LibraryWindow.c"
 	}
 #line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = collection;
@@ -4064,27 +4541,31 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 	_g_object_unref0 (collection);
 #line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 4068 "LibraryWindow.c"
+#line 4545 "LibraryWindow.c"
 }
 
 
-static void _g_free0_ (gpointer var) {
+static void
+_g_free0_ (gpointer var)
+{
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	var = (g_free (var), NULL);
-#line 4075 "LibraryWindow.c"
+#line 4554 "LibraryWindow.c"
 }
 
 
-static void _g_slist_free__g_free0_ (GSList* self) {
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_slist_foreach (self, (GFunc) _g_free0_, NULL);
+static inline void
+_g_slist_free__g_free0_ (GSList* self)
+{
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_slist_free (self);
-#line 4084 "LibraryWindow.c"
+	g_slist_free_full (self, (GDestroyNotify) _g_free0_);
+#line 4563 "LibraryWindow.c"
 }
 
 
-static void library_window_on_file_import (LibraryWindow* self) {
+static void
+library_window_on_file_import (LibraryWindow* self)
+{
 	GtkFileChooserDialog* import_dialog = NULL;
 	GtkFileChooserDialog* _tmp0_;
 	GtkFileChooserDialog* _tmp1_;
@@ -4100,13 +4581,12 @@ static void library_window_on_file_import (LibraryWindow* self) {
 	gint response = 0;
 	GtkFileChooserDialog* _tmp10_;
 	gint _tmp11_;
-	gint _tmp12_;
-	GtkFileChooserDialog* _tmp31_;
-	gchar* _tmp32_;
-	GtkCheckButton* _tmp33_;
-	gboolean _tmp34_;
-	gboolean _tmp35_;
-	GtkFileChooserDialog* _tmp36_;
+	GtkFileChooserDialog* _tmp28_;
+	gchar* _tmp29_;
+	GtkCheckButton* _tmp30_;
+	gboolean _tmp31_;
+	gboolean _tmp32_;
+	GtkFileChooserDialog* _tmp33_;
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4118,17 +4598,17 @@ static void library_window_on_file_import (LibraryWindow* self) {
 #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = import_dialog;
 #line 511 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
+	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_file_chooser_get_type (), GtkFileChooser), FALSE);
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = import_dialog;
 #line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
+	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_file_chooser_get_type (), GtkFileChooser), TRUE);
 #line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = import_dialog;
 #line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->import_dir;
 #line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_);
+	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_file_chooser_get_type (), GtkFileChooser), _tmp4_);
 #line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = (GtkCheckButton*) gtk_check_button_new_with_label (_ ("Recurse Into Subfolders"));
 #line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4146,128 +4626,122 @@ static void library_window_on_file_import (LibraryWindow* self) {
 #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = recursive;
 #line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+	gtk_file_chooser_set_extra_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_file_chooser_get_type (), GtkFileChooser), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = import_dialog;
 #line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog));
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	response = _tmp11_;
+	response = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog));
 #line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = response;
+	_tmp11_ = response;
 #line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp12_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4161 "LibraryWindow.c"
-		GtkFileChooserDialog* _tmp13_;
-		GtkResponseType _tmp14_ = 0;
-		GtkFileChooserDialog* _tmp15_;
+	if (_tmp11_ == ((gint) GTK_RESPONSE_OK)) {
+#line 4639 "LibraryWindow.c"
+		GtkFileChooserDialog* _tmp12_;
+		GtkResponseType _tmp13_ = 0;
+		GtkFileChooserDialog* _tmp14_;
+		gchar* _tmp15_;
 		gchar* _tmp16_;
-		gchar* _tmp17_;
+		GFile* _tmp17_;
 		GFile* _tmp18_;
-		GFile* _tmp19_;
-		gboolean _tmp20_;
-		gboolean _tmp21_;
+		gboolean _tmp19_;
 		GtkResponseType copy_files_response = 0;
-		GtkResponseType _tmp23_;
+		GtkResponseType _tmp20_;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = import_dialog;
+		_tmp12_ = import_dialog;
 #line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = import_dialog;
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+		_tmp14_ = import_dialog;
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = _tmp16_;
+		_tmp15_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_file_chooser_get_type (), GtkFileChooser));
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp18_ = g_file_new_for_uri (_tmp17_);
+		_tmp16_ = _tmp15_;
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp19_ = _tmp18_;
+		_tmp17_ = g_file_new_for_uri (_tmp16_);
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp20_ = app_dirs_is_in_import_dir (_tmp19_);
+		_tmp18_ = _tmp17_;
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp21_ = _tmp20_;
+		_tmp19_ = app_dirs_is_in_import_dir (_tmp18_);
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp19_);
+		_g_object_unref0 (_tmp18_);
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_free0 (_tmp17_);
+		_g_free0 (_tmp16_);
 #line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp21_) {
+		if (_tmp19_) {
 #line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp14_ = GTK_RESPONSE_REJECT;
-#line 4199 "LibraryWindow.c"
+			_tmp13_ = GTK_RESPONSE_REJECT;
+#line 4674 "LibraryWindow.c"
 		} else {
-			GtkResponseType _tmp22_;
 #line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp22_ = copy_files_dialog ();
-#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp14_ = _tmp22_;
-#line 4206 "LibraryWindow.c"
+			_tmp13_ = copy_files_dialog ();
+#line 4678 "LibraryWindow.c"
 		}
 #line 524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		copy_files_response = _tmp14_;
+		copy_files_response = _tmp13_;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp23_ = copy_files_response;
+		_tmp20_ = copy_files_response;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp23_ != GTK_RESPONSE_CANCEL) {
-#line 4214 "LibraryWindow.c"
-			GtkFileChooserDialog* _tmp24_;
-			GSList* _tmp25_;
-			GSList* _tmp26_;
-			GtkResponseType _tmp27_;
-			GtkCheckButton* _tmp28_;
-			gboolean _tmp29_;
-			gboolean _tmp30_;
+		if (_tmp20_ != GTK_RESPONSE_CANCEL) {
+#line 4686 "LibraryWindow.c"
+			GtkFileChooserDialog* _tmp21_;
+			GSList* _tmp22_;
+			GSList* _tmp23_;
+			GtkResponseType _tmp24_;
+			GtkCheckButton* _tmp25_;
+			gboolean _tmp26_;
+			gboolean _tmp27_;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp24_ = import_dialog;
+			_tmp21_ = import_dialog;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp25_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+			_tmp22_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_file_chooser_get_type (), GtkFileChooser));
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp26_ = _tmp25_;
+			_tmp23_ = _tmp22_;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp27_ = copy_files_response;
+			_tmp24_ = copy_files_response;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp28_ = recursive;
+			_tmp25_ = recursive;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp29_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_toggle_button_get_type (), GtkToggleButton));
+			_tmp26_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp30_ = _tmp29_;
+			_tmp27_ = _tmp26_;
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			library_window_dispatch_import_jobs (self, _tmp26_, "folders", _tmp27_ == GTK_RESPONSE_ACCEPT, _tmp30_);
+			library_window_dispatch_import_jobs (self, _tmp23_, "folders", _tmp24_ == GTK_RESPONSE_ACCEPT, _tmp27_);
 #line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			__g_slist_free__g_free0_0 (_tmp26_);
-#line 4240 "LibraryWindow.c"
+			__g_slist_free__g_free0_0 (_tmp23_);
+#line 4712 "LibraryWindow.c"
 		}
 	}
 #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = import_dialog;
+	_tmp28_ = import_dialog;
 #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
+	_tmp29_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_file_chooser_get_type (), GtkFileChooser));
 #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (self->priv->import_dir);
 #line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_dir = _tmp32_;
+	self->priv->import_dir = _tmp29_;
 #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = recursive;
+	_tmp30_ = recursive;
 #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_toggle_button_get_type (), GtkToggleButton));
+	_tmp31_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = _tmp34_;
+	_tmp32_ = _tmp31_;
 #line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->import_recursive = _tmp35_;
+	self->priv->import_recursive = _tmp32_;
 #line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp36_ = import_dialog;
+	_tmp33_ = import_dialog;
 #line 536 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (recursive);
 #line 507 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4267 "LibraryWindow.c"
+#line 4739 "LibraryWindow.c"
 }
 
 
-static void library_window_on_external_library_import (LibraryWindow* self) {
+static void
+library_window_on_external_library_import (LibraryWindow* self)
+{
 	GtkDialog* import_dialog = NULL;
 	DataImportsUIDataImportsDialog* _tmp0_;
 #line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4280,16 +4754,17 @@ static void library_window_on_external_library_import (LibraryWindow* self) {
 	gtk_dialog_run (import_dialog);
 #line 539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 4284 "LibraryWindow.c"
+#line 4758 "LibraryWindow.c"
 }
 
 
-static void library_window_real_update_common_action_availability (AppWindow* base, Page* old_page, Page* new_page) {
+static void
+library_window_real_update_common_action_availability (AppWindow* base,
+                                                       Page* old_page,
+                                                       Page* new_page)
+{
 	LibraryWindow * self;
-	Page* _tmp0_;
-	Page* _tmp1_;
 	gboolean is_checkerboard = FALSE;
-	Page* _tmp2_;
 #line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4297,131 +4772,109 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
 #line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = old_page;
-#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = new_page;
-#line 546 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_, _tmp1_);
+	APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), old_page, new_page);
 #line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = new_page;
-#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
+	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (new_page, TYPE_CHECKERBOARD_PAGE);
 #line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
 #line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard);
-#line 4314 "LibraryWindow.c"
+#line 4783 "LibraryWindow.c"
 }
 
 
-static void library_window_real_update_common_actions (AppWindow* base, Page* page, gint selected_count, gint count) {
+static void
+library_window_real_update_common_actions (AppWindow* base,
+                                           Page* page,
+                                           gint selected_count,
+                                           gint count)
+{
 	LibraryWindow * self;
 	CollectionPage* collection = NULL;
 	Photo* start = NULL;
 	gboolean can_fullscreen = FALSE;
-	Page* _tmp0_;
-	CollectionPage* _tmp1_ = NULL;
-	Photo* _tmp2_ = NULL;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
-	Page* _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
+	CollectionPage* _tmp0_ = NULL;
+	Photo* _tmp1_ = NULL;
+	gboolean _tmp2_;
 #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
-#line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL);
+	_tmp2_ = library_window_get_fullscreen_photo (self, page, &_tmp0_, &_tmp1_, NULL);
 #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
 #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	collection = _tmp1_;
+	collection = _tmp0_;
 #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
 #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	start = _tmp2_;
+	start = _tmp1_;
 #line 560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	can_fullscreen = _tmp3_;
+	can_fullscreen = _tmp2_;
 #line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = library_window_can_empty_trash (self);
-#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp4_);
+	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self));
 #line 563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE);
 #line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = library_window_can_jump_to_event (self);
-#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp5_);
+	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self));
 #line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen);
 #line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = page;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = selected_count;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = count;
-#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp6_, _tmp7_, _tmp8_);
+	APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), page, selected_count, count);
 #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
 #line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 4374 "LibraryWindow.c"
+#line 4830 "LibraryWindow.c"
 }
 
 
-static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
-	gboolean _tmp0_;
+static void
+library_window_on_trashcan_contents_altered (LibraryWindow* self)
+{
 #line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = library_window_can_empty_trash (self);
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_);
-#line 4386 "LibraryWindow.c"
+	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", library_window_can_empty_trash (self));
+#line 4841 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_can_empty_trash (LibraryWindow* self) {
+static gboolean
+library_window_can_empty_trash (LibraryWindow* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	LibraryPhotoSourceCollection* _tmp1_;
-	gint _tmp2_;
 #line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_ > 0) {
+	if (media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0) {
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
-#line 4405 "LibraryWindow.c"
+#line 4859 "LibraryWindow.c"
 	} else {
-		VideoSourceCollection* _tmp3_;
-		gint _tmp4_;
-#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = video_global;
+		VideoSourceCollection* _tmp2_;
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+		_tmp2_ = video_global;
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp0_ = _tmp4_ > 0;
-#line 4415 "LibraryWindow.c"
+		_tmp0_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection)) > 0;
+#line 4866 "LibraryWindow.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
 #line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4421 "LibraryWindow.c"
+#line 4872 "LibraryWindow.c"
 }
 
 
-static void library_window_on_empty_trash (LibraryWindow* self) {
+static void
+library_window_on_empty_trash (LibraryWindow* self)
+{
 	GeeArrayList* to_remove = NULL;
 	GeeArrayList* _tmp0_;
 	LibraryPhotoSourceCollection* _tmp1_;
@@ -4470,11 +4923,13 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 	_command_manager_unref0 (_tmp8_);
 #line 578 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
-#line 4474 "LibraryWindow.c"
+#line 4927 "LibraryWindow.c"
 }
 
 
-static void library_window_on_new_search (LibraryWindow* self) {
+static void
+library_window_on_new_search (LibraryWindow* self)
+{
 	SavedSearchDialog* _tmp0_;
 	SavedSearchDialog* _tmp1_;
 #line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4489,11 +4944,13 @@ static void library_window_on_new_search (LibraryWindow* self) {
 	saved_search_dialog_show (_tmp1_);
 #line 589 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 4493 "LibraryWindow.c"
+#line 4948 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
+static gboolean
+library_window_can_jump_to_event (LibraryWindow* self)
+{
 	gboolean result = FALSE;
 	ViewCollection* view = NULL;
 	Page* _tmp0_;
@@ -4501,7 +4958,6 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	ViewCollection* _tmp2_;
 	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	gint _tmp5_;
 #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4519,24 +4975,22 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp5_ == 1) {
-#line 4526 "LibraryWindow.c"
+	if (view_collection_get_selected_count (_tmp4_) == 1) {
+#line 4980 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
-		ViewCollection* _tmp6_;
+		ViewCollection* _tmp5_;
+		DataSource* _tmp6_;
 		DataSource* _tmp7_;
-		DataSource* _tmp8_;
 #line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = view;
+		_tmp5_ = view;
 #line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
+		_tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0);
 #line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		selected_source = _tmp7_;
+		selected_source = _tmp6_;
 #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = selected_source;
+		_tmp7_ = selected_source;
 #line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) {
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_EVENT)) {
 #line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = TRUE;
 #line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4545,45 +4999,45 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 			_data_collection_unref0 (view);
 #line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 4549 "LibraryWindow.c"
+#line 5003 "LibraryWindow.c"
 		} else {
-			DataSource* _tmp9_;
+			DataSource* _tmp8_;
 #line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp9_ = selected_source;
+			_tmp8_ = selected_source;
 #line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 4556 "LibraryWindow.c"
-				ViewCollection* _tmp10_;
-				DataSource* _tmp11_;
-				MediaSource* _tmp12_;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_MEDIA_SOURCE)) {
+#line 5010 "LibraryWindow.c"
+				ViewCollection* _tmp9_;
+				DataSource* _tmp10_;
+				MediaSource* _tmp11_;
+				Event* _tmp12_;
 				Event* _tmp13_;
-				Event* _tmp14_;
-				gboolean _tmp15_;
+				gboolean _tmp14_;
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp10_ = view;
+				_tmp9_ = view;
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0);
+				_tmp10_ = view_collection_get_selected_source_at (_tmp9_, 0);
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource);
+				_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp13_ = media_source_get_event (_tmp12_);
+				_tmp12_ = media_source_get_event (_tmp11_);
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp14_ = _tmp13_;
+				_tmp13_ = _tmp12_;
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp15_ = _tmp14_ != NULL;
+				_tmp14_ = _tmp13_ != NULL;
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_g_object_unref0 (_tmp14_);
+				_g_object_unref0 (_tmp13_);
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_g_object_unref0 (_tmp12_);
+				_g_object_unref0 (_tmp11_);
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				result = _tmp15_;
+				result = _tmp14_;
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
 #line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4587 "LibraryWindow.c"
+#line 5041 "LibraryWindow.c"
 			} else {
 #line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
@@ -4593,12 +5047,12 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 				_data_collection_unref0 (view);
 #line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 4597 "LibraryWindow.c"
+#line 5051 "LibraryWindow.c"
 			}
 		}
 #line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
-#line 4602 "LibraryWindow.c"
+#line 5056 "LibraryWindow.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
@@ -4606,31 +5060,32 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 		_data_collection_unref0 (view);
 #line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 4610 "LibraryWindow.c"
+#line 5064 "LibraryWindow.c"
 	}
 #line 592 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4614 "LibraryWindow.c"
+#line 5068 "LibraryWindow.c"
 }
 
 
-static void library_window_on_jump_to_event (LibraryWindow* self) {
+static void
+library_window_on_jump_to_event (LibraryWindow* self)
+{
 	ViewCollection* view = NULL;
 	Page* _tmp0_;
 	Page* _tmp1_;
 	ViewCollection* _tmp2_;
 	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	gint _tmp5_;
 	MediaSource* media = NULL;
-	ViewCollection* _tmp6_;
-	DataSource* _tmp7_;
+	ViewCollection* _tmp5_;
+	DataSource* _tmp6_;
+	MediaSource* _tmp7_;
 	MediaSource* _tmp8_;
 	MediaSource* _tmp9_;
-	MediaSource* _tmp10_;
+	Event* _tmp10_;
 	Event* _tmp11_;
-	Event* _tmp12_;
-	gboolean _tmp13_;
+	gboolean _tmp12_;
 #line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4648,85 +5103,87 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
 #line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp5_ != 1) {
+	if (view_collection_get_selected_count (_tmp4_) != 1) {
 #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
 #line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4659 "LibraryWindow.c"
+#line 5112 "LibraryWindow.c"
 	}
 #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = view;
+	_tmp5_ = view;
 #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
+	_tmp6_ = view_collection_get_selected_source_at (_tmp5_, 0);
 #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL;
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp6_) : NULL;
 #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp8_ == NULL) {
+	if (_tmp7_ == NULL) {
 #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp7_);
-#line 4671 "LibraryWindow.c"
+		_g_object_unref0 (_tmp6_);
+#line 5124 "LibraryWindow.c"
 	}
 #line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	media = _tmp8_;
+	media = _tmp7_;
 #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = media;
+	_tmp8_ = media;
 #line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp9_ == NULL) {
+	if (_tmp8_ == NULL) {
 #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (media);
 #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
 #line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4685 "LibraryWindow.c"
+#line 5138 "LibraryWindow.c"
 	}
 #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = media;
+	_tmp9_ = media;
 #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = media_source_get_event (_tmp10_);
+	_tmp10_ = media_source_get_event (_tmp9_);
 #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = _tmp12_ != NULL;
+	_tmp12_ = _tmp11_ != NULL;
 #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp11_);
 #line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp13_) {
-#line 4699 "LibraryWindow.c"
-		MediaSource* _tmp14_;
+	if (_tmp12_) {
+#line 5152 "LibraryWindow.c"
+		MediaSource* _tmp13_;
+		Event* _tmp14_;
 		Event* _tmp15_;
-		Event* _tmp16_;
 #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = media;
+		_tmp13_ = media;
 #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = media_source_get_event (_tmp14_);
+		_tmp14_ = media_source_get_event (_tmp13_);
 #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_event (self, _tmp16_);
+		library_window_switch_to_event (self, _tmp15_);
 #line 618 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp16_);
-#line 4713 "LibraryWindow.c"
+		_g_object_unref0 (_tmp15_);
+#line 5166 "LibraryWindow.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
 #line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 4719 "LibraryWindow.c"
+#line 5172 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new5 (gboolean value) {
+static GVariant*
+_variant_new5 (gboolean value)
+{
 #line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4726 "LibraryWindow.c"
+#line 5181 "LibraryWindow.c"
 }
 
 
-static void library_window_on_find (LibraryWindow* self) {
+static void
+library_window_on_find (LibraryWindow* self)
+{
 	GAction* action = NULL;
 	GAction* _tmp0_;
 	GAction* _tmp1_;
@@ -4752,23 +5209,24 @@ static void library_window_on_find (LibraryWindow* self) {
 	search_filter_toolbar_take_focus (_tmp3_);
 #line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 4756 "LibraryWindow.c"
+#line 5213 "LibraryWindow.c"
 }
 
 
-static void library_window_on_media_altered (LibraryWindow* self) {
-	gboolean _tmp0_;
+static void
+library_window_on_media_altered (LibraryWindow* self)
+{
 #line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = library_window_can_jump_to_event (self);
-#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_);
-#line 4768 "LibraryWindow.c"
+	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", library_window_can_jump_to_event (self));
+#line 5224 "LibraryWindow.c"
 }
 
 
-static void library_window_on_clear_search (LibraryWindow* self) {
+static void
+library_window_on_clear_search (LibraryWindow* self)
+{
 	gboolean _tmp0_;
 #line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -4776,18 +5234,20 @@ static void library_window_on_clear_search (LibraryWindow* self) {
 	_tmp0_ = self->priv->is_search_toolbar_visible;
 #line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 4780 "LibraryWindow.c"
+#line 5238 "LibraryWindow.c"
 		SearchFilterActions* _tmp1_;
 #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
 #line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
-#line 4786 "LibraryWindow.c"
+#line 5244 "LibraryWindow.c"
 	}
 }
 
 
-gint library_window_get_events_sort (LibraryWindow* self) {
+gint
+library_window_get_events_sort (LibraryWindow* self)
+{
 	gint result = 0;
 	GSimpleAction* action = NULL;
 	GAction* _tmp0_;
@@ -4806,7 +5266,7 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	_tmp3_ = action;
 #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4810 "LibraryWindow.c"
+#line 5270 "LibraryWindow.c"
 		gint _tmp4_ = 0;
 		GSimpleAction* _tmp5_;
 		GVariant* _tmp6_;
@@ -4832,19 +5292,19 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 		if (_tmp10_) {
 #line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 0;
-#line 4836 "LibraryWindow.c"
+#line 5296 "LibraryWindow.c"
 		} else {
 #line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = 1;
-#line 4840 "LibraryWindow.c"
+#line 5300 "LibraryWindow.c"
 		}
 #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp4_;
-#line 4844 "LibraryWindow.c"
+#line 5304 "LibraryWindow.c"
 	} else {
 #line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = 1;
-#line 4848 "LibraryWindow.c"
+#line 5308 "LibraryWindow.c"
 	}
 #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
@@ -4852,17 +5312,18 @@ gint library_window_get_events_sort (LibraryWindow* self) {
 	_g_object_unref0 (action);
 #line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4856 "LibraryWindow.c"
+#line 5316 "LibraryWindow.c"
 }
 
 
-static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_events_sort_changed (LibraryWindow* self,
+                                       GSimpleAction* action,
+                                       GVariant* value)
+{
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	GVariant* _tmp2_;
-	const gchar* _tmp3_;
-	GSimpleAction* _tmp4_;
-	GVariant* _tmp5_;
+	const gchar* _tmp2_;
 #line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -4872,300 +5333,277 @@ static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleA
 #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
 #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = value;
+	_tmp2_ = g_variant_get_string (value, NULL);
 #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0);
+	configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp2_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0);
 #line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
 #line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = action;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = value;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 4889 "LibraryWindow.c"
+	g_simple_action_set_state (action, value);
+#line 5344 "LibraryWindow.c"
 }
 
 
-static void library_window_on_preferences (LibraryWindow* self) {
+static void
+library_window_on_preferences (LibraryWindow* self)
+{
 #line 654 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 655 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	preferences_dialog_show_preferences ();
-#line 4898 "LibraryWindow.c"
+#line 5355 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_display_basic_properties (LibraryWindow* self,
+                                            GSimpleAction* action,
+                                            GVariant* value)
+{
 	gboolean display = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	ConfigFacade* _tmp10_;
-	ConfigFacade* _tmp11_;
-	gboolean _tmp12_;
-	GSimpleAction* _tmp13_;
-	GVariant* _tmp14_;
+	gboolean _tmp0_;
+	ConfigFacade* _tmp8_;
+	ConfigFacade* _tmp9_;
+	gboolean _tmp10_;
 #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = value;
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	display = _tmp1_;
+	display = g_variant_get_boolean (value);
 #line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = display;
+	_tmp0_ = display;
 #line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_) {
-#line 4926 "LibraryWindow.c"
-		BasicProperties* _tmp3_;
-		Page* _tmp4_;
-		Page* _tmp5_;
-		GtkFrame* _tmp6_;
+	if (_tmp0_) {
+#line 5379 "LibraryWindow.c"
+		BasicProperties* _tmp1_;
+		Page* _tmp2_;
+		Page* _tmp3_;
+		GtkFrame* _tmp4_;
 #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = self->priv->basic_properties;
+		_tmp1_ = self->priv->basic_properties;
 #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+		_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = _tmp2_;
 #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
+		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PROPERTIES, Properties), _tmp3_);
 #line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp5_);
+		_g_object_unref0 (_tmp3_);
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = self->priv->bottom_frame;
+		_tmp4_ = self->priv->bottom_frame;
 #line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 4945 "LibraryWindow.c"
+		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+#line 5398 "LibraryWindow.c"
 	} else {
-		GtkPaned* _tmp7_;
-		GtkWidget* _tmp8_;
+		GtkPaned* _tmp5_;
+		GtkWidget* _tmp6_;
 #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = self->priv->sidebar_paned;
+		_tmp5_ = self->priv->sidebar_paned;
 #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = gtk_paned_get_child2 (_tmp7_);
+		_tmp6_ = gtk_paned_get_child2 (_tmp5_);
 #line 665 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp8_ != NULL) {
-#line 4955 "LibraryWindow.c"
-			GtkFrame* _tmp9_;
+		if (_tmp6_ != NULL) {
+#line 5408 "LibraryWindow.c"
+			GtkFrame* _tmp7_;
 #line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp9_ = self->priv->bottom_frame;
+			_tmp7_ = self->priv->bottom_frame;
 #line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 4961 "LibraryWindow.c"
+			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+#line 5414 "LibraryWindow.c"
 		}
 	}
 #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = config_facade_get_instance ();
+	_tmp8_ = config_facade_get_instance ();
 #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = _tmp10_;
+	_tmp9_ = _tmp8_;
 #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = display;
+	_tmp10_ = display;
 #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
+	configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
 #line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp11_);
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = action;
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = value;
+	_g_object_unref0 (_tmp9_);
 #line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_simple_action_set_state (_tmp13_, _tmp14_);
-#line 4980 "LibraryWindow.c"
+	g_simple_action_set_state (action, value);
+#line 5429 "LibraryWindow.c"
 }
 
 
-static gboolean _variant_get6 (GVariant* value) {
+static gboolean
+_variant_get6 (GVariant* value)
+{
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_get_boolean (value);
-#line 4987 "LibraryWindow.c"
+#line 5438 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new7 (gboolean value) {
+static GVariant*
+_variant_new7 (gboolean value)
+{
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4994 "LibraryWindow.c"
+#line 5447 "LibraryWindow.c"
 }
 
 
-static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value) {
+static void
+library_window_on_action_toggle (LibraryWindow* self,
+                                 GAction* action,
+                                 GVariant* value)
+{
 	GVariant* new_state = NULL;
-	GAction* _tmp0_;
+	GVariant* _tmp0_;
 	GVariant* _tmp1_;
-	GVariant* _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
+	GVariant* _tmp3_;
 	GVariant* _tmp4_;
-	GVariant* _tmp5_;
-	GAction* _tmp6_;
 #line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_ACTION (action));
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = action;
-#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = g_action_get_state (_tmp0_);
+	_tmp0_ = g_action_get_state (action);
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _variant_get6 (_tmp2_);
+	_tmp2_ = _variant_get6 (_tmp1_);
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = _variant_new7 (!_tmp3_);
+	_tmp3_ = _variant_new7 (!_tmp2_);
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp2_);
+	_g_variant_unref0 (_tmp1_);
 #line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	new_state = _tmp5_;
-#line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = action;
+	new_state = _tmp4_;
 #line 677 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp6_, new_state);
+	g_action_change_state (action, new_state);
 #line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_variant_unref0 (new_state);
-#line 5033 "LibraryWindow.c"
+#line 5484 "LibraryWindow.c"
 }
 
 
-static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) {
-	GAction* _tmp0_;
-	GVariant* _tmp1_;
+static void
+library_window_on_action_radio (LibraryWindow* self,
+                                GAction* action,
+                                GVariant* value)
+{
 #line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 680 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_ACTION (action));
 #line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = action;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = value;
-#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp0_, _tmp1_);
-#line 5050 "LibraryWindow.c"
+	g_action_change_state (action, value);
+#line 5499 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_display_extended_properties (LibraryWindow* self,
+                                               GSimpleAction* action,
+                                               GVariant* value)
+{
 	gboolean display = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	GSimpleAction* _tmp8_;
-	GVariant* _tmp9_;
+	gboolean _tmp0_;
 #line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = value;
-#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	display = _tmp1_;
+	display = g_variant_get_boolean (value);
 #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = display;
+	_tmp0_ = display;
 #line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_) {
-#line 5075 "LibraryWindow.c"
-		ExtendedPropertiesWindow* _tmp3_;
-		Page* _tmp4_;
-		Page* _tmp5_;
-		ExtendedPropertiesWindow* _tmp6_;
+	if (_tmp0_) {
+#line 5520 "LibraryWindow.c"
+		ExtendedPropertiesWindow* _tmp1_;
+		Page* _tmp2_;
+		Page* _tmp3_;
+		ExtendedPropertiesWindow* _tmp4_;
 #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = self->priv->extended_properties;
+		_tmp1_ = self->priv->extended_properties;
 #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+		_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = _tmp2_;
 #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		extended_properties_window_update_properties (_tmp3_, _tmp5_);
+		extended_properties_window_update_properties (_tmp1_, _tmp3_);
 #line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp5_);
+		_g_object_unref0 (_tmp3_);
 #line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = self->priv->extended_properties;
+		_tmp4_ = self->priv->extended_properties;
 #line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 5094 "LibraryWindow.c"
+		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+#line 5539 "LibraryWindow.c"
 	} else {
-		ExtendedPropertiesWindow* _tmp7_;
+		ExtendedPropertiesWindow* _tmp5_;
 #line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = self->priv->extended_properties;
+		_tmp5_ = self->priv->extended_properties;
 #line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 5101 "LibraryWindow.c"
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
+#line 5546 "LibraryWindow.c"
 	}
 #line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = action;
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = value;
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_simple_action_set_state (_tmp8_, _tmp9_);
-#line 5109 "LibraryWindow.c"
+	g_simple_action_set_state (action, value);
+#line 5550 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new8 (gboolean value) {
+static GVariant*
+_variant_new8 (gboolean value)
+{
 #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5116 "LibraryWindow.c"
+#line 5559 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+static void
+library_window_on_display_searchbar (LibraryWindow* self,
+                                     GSimpleAction* action,
+                                     GVariant* value)
+{
 	gboolean is_shown = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	GSimpleAction* _tmp4_;
-	GVariant* _tmp5_;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	GVariant* _tmp2_;
 #line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = value;
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	is_shown = _tmp1_;
+	is_shown = g_variant_get_boolean (value);
 #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp0_ = config_facade_get_instance ();
 #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown);
+	configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown);
 #line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp1_);
 #line 701 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_search_bar (self, is_shown);
 #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = action;
+	_tmp2_ = _variant_new8 (is_shown);
 #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = _variant_new8 (is_shown);
+	g_simple_action_set_state (action, _tmp2_);
 #line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 702 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp5_);
-#line 5156 "LibraryWindow.c"
+	_g_variant_unref0 (_tmp2_);
+#line 5594 "LibraryWindow.c"
 }
 
 
-void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
+void
+library_window_show_search_bar (LibraryWindow* self,
+                                gboolean display)
+{
 	Page* _tmp0_;
 	Page* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-	Page* _tmp5_;
-	CheckerboardPage* _tmp6_;
-	CheckerboardPage* _tmp7_;
-	gboolean _tmp8_;
+	Page* _tmp3_;
+	CheckerboardPage* _tmp4_;
+	CheckerboardPage* _tmp5_;
 #line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5180,104 +5618,88 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	if (_tmp2_) {
 #line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5184 "LibraryWindow.c"
+#line 5622 "LibraryWindow.c"
 	}
 #line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = display;
-#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->is_search_toolbar_visible = _tmp3_;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = library_window_should_show_search_bar (self);
+	self->priv->is_search_toolbar_visible = display;
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp3_) : NULL;
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp6_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp5_);
-#line 5200 "LibraryWindow.c"
+		_g_object_unref0 (_tmp3_);
+#line 5634 "LibraryWindow.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _tmp6_;
+	_tmp5_ = _tmp4_;
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_toggle_search_bar (self, _tmp4_, _tmp7_);
+	library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), _tmp5_);
 #line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp7_);
-#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = display;
+	_g_object_unref0 (_tmp5_);
 #line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!_tmp8_) {
-#line 5212 "LibraryWindow.c"
-		SearchFilterActions* _tmp9_;
+	if (!display) {
+#line 5644 "LibraryWindow.c"
+		SearchFilterActions* _tmp6_;
 #line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = self->priv->search_actions;
+		_tmp6_ = self->priv->search_actions;
 #line 712 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		search_filter_actions_reset (_tmp9_);
-#line 5218 "LibraryWindow.c"
+		search_filter_actions_reset (_tmp6_);
+#line 5650 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	GSimpleAction* _tmp2_;
-	GVariant* _tmp3_;
+static void
+library_window_on_display_sidebar (LibraryWindow* self,
+                                   GSimpleAction* action,
+                                   GVariant* variant)
+{
 #line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = variant;
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 716 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_set_sidebar_visible (self, _tmp1_);
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = action;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = variant;
+	library_window_set_sidebar_visible (self, g_variant_get_boolean (variant));
 #line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5244 "LibraryWindow.c"
+	g_simple_action_set_state (action, variant);
+#line 5668 "LibraryWindow.c"
 }
 
 
-static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible) {
+static void
+library_window_set_sidebar_visible (LibraryWindow* self,
+                                    gboolean visible)
+{
 	GtkPaned* _tmp0_;
-	gboolean _tmp1_;
+	ConfigFacade* _tmp1_;
 	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	gboolean _tmp4_;
 #line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_paned;
 #line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = visible;
-#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), visible);
 #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp1_ = config_facade_get_instance ();
 #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = visible;
+	_tmp2_ = _tmp1_;
 #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
+	configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible);
 #line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp3_);
-#line 5272 "LibraryWindow.c"
+	_g_object_unref0 (_tmp2_);
+#line 5693 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
+static gboolean
+library_window_is_sidebar_visible (LibraryWindow* self)
+{
 	gboolean result = FALSE;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5286,44 +5708,37 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	_tmp1_ = _tmp0_;
 #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
 #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
 #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5298 "LibraryWindow.c"
+#line 5718 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	GSimpleAction* _tmp2_;
-	GVariant* _tmp3_;
+static void
+library_window_on_display_toolbar (LibraryWindow* self,
+                                   GSimpleAction* action,
+                                   GVariant* variant)
+{
 #line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 730 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = variant;
-#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_set_toolbar_visible (self, _tmp1_);
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = action;
-#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = variant;
+	library_window_set_toolbar_visible (self, g_variant_get_boolean (variant));
 #line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_simple_action_set_state (_tmp2_, _tmp3_);
-#line 5323 "LibraryWindow.c"
+	g_simple_action_set_state (action, variant);
+#line 5735 "LibraryWindow.c"
 }
 
 
-static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible) {
+static void
+library_window_set_toolbar_visible (LibraryWindow* self,
+                                    gboolean visible)
+{
 	Page* _tmp0_;
 	Page* _tmp1_;
 	gboolean _tmp2_;
@@ -5333,9 +5748,8 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	GtkToolbar* _tmp5_;
 	GtkToolbar* _tmp6_;
 	GtkToolbar* _tmp7_;
+	ConfigFacade* _tmp9_;
 	ConfigFacade* _tmp10_;
-	ConfigFacade* _tmp11_;
-	gboolean _tmp12_;
 #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5350,7 +5764,7 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	if (_tmp2_) {
 #line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5354 "LibraryWindow.c"
+#line 5768 "LibraryWindow.c"
 	}
 #line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
@@ -5368,39 +5782,35 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	_tmp7_ = toolbar;
 #line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp7_ != NULL) {
-#line 5372 "LibraryWindow.c"
+#line 5786 "LibraryWindow.c"
 		GtkRevealer* _tmp8_;
-		gboolean _tmp9_;
 #line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->toolbar_revealer;
 #line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = visible;
-#line 743 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_revealer_set_reveal_child (_tmp8_, _tmp9_);
-#line 5381 "LibraryWindow.c"
+		gtk_revealer_set_reveal_child (_tmp8_, visible);
+#line 5792 "LibraryWindow.c"
 	}
 #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = config_facade_get_instance ();
+	_tmp9_ = config_facade_get_instance ();
 #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = _tmp10_;
-#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = visible;
+	_tmp10_ = _tmp9_;
 #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
+	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), visible);
 #line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp10_);
 #line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 5395 "LibraryWindow.c"
+#line 5804 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
+static gboolean
+library_window_is_toolbar_visible (LibraryWindow* self)
+{
 	gboolean result = FALSE;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 748 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
 #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5409,52 +5819,57 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	_tmp1_ = _tmp0_;
 #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
 #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
 #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5421 "LibraryWindow.c"
+#line 5829 "LibraryWindow.c"
 }
 
 
-static void library_window_show_extended_properties (LibraryWindow* self) {
+static void
+library_window_show_extended_properties (LibraryWindow* self)
+{
 #line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
-#line 5430 "LibraryWindow.c"
+#line 5840 "LibraryWindow.c"
 }
 
 
-static void library_window_hide_extended_properties (LibraryWindow* self) {
+static void
+library_window_hide_extended_properties (LibraryWindow* self)
+{
 #line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
-#line 5439 "LibraryWindow.c"
+#line 5851 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new9 (gboolean value) {
+static GVariant*
+_variant_new9 (gboolean value)
+{
 #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5446 "LibraryWindow.c"
+#line 5860 "LibraryWindow.c"
 }
 
 
-static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show) {
+static void
+library_window_sync_extended_properties (LibraryWindow* self,
+                                         gboolean show)
+{
 	GAction* action = NULL;
 	GAction* _tmp0_;
 	GAction* _tmp1_;
-	gboolean _tmp2_;
-	GVariant* _tmp3_;
+	GVariant* _tmp2_;
+	ConfigFacade* _tmp3_;
 	ConfigFacade* _tmp4_;
-	ConfigFacade* _tmp5_;
-	gboolean _tmp6_;
 #line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5464,35 +5879,33 @@ static void library_window_sync_extended_properties (LibraryWindow* self, gboole
 #line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
 #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = show;
-#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _variant_new9 (_tmp2_);
+	_tmp2_ = _variant_new9 (show);
 #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (action, _tmp3_);
+	g_action_change_state (action, _tmp2_);
 #line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp3_);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = config_facade_get_instance ();
+	_g_variant_unref0 (_tmp2_);
 #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = config_facade_get_instance ();
 #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = show;
+	_tmp4_ = _tmp3_;
 #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_);
+	configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), show);
 #line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp4_);
 #line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 5487 "LibraryWindow.c"
+#line 5898 "LibraryWindow.c"
 }
 
 
-void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel) {
+void
+library_window_enqueue_batch_import (LibraryWindow* self,
+                                     BatchImport* batch_import,
+                                     gboolean allow_user_cancel)
+{
 	LibraryBranch* _tmp0_;
 	LibraryImportQueueSidebarEntry* _tmp1_;
 	LibraryImportQueueSidebarEntry* _tmp2_;
-	BatchImport* _tmp3_;
-	gboolean _tmp4_;
 #line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5504,37 +5917,43 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
 #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
 #line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = batch_import;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = allow_user_cancel;
-#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 5513 "LibraryWindow.c"
+	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, batch_import, allow_user_cancel);
+#line 5922 "LibraryWindow.c"
 }
 
 
-static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
-	ImportManifest* _tmp0_;
+static void
+library_window_import_reporter (LibraryWindow* self,
+                                ImportManifest* manifest)
+{
 #line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 772 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
 #line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = manifest;
-#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 5527 "LibraryWindow.c"
+	import_ui_report_manifest (manifest, TRUE, NULL);
+#line 5936 "LibraryWindow.c"
 }
 
 
-static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
+static void
+_library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest,
+                                                              BatchImportRoll* import_roll,
+                                                              gpointer self)
+{
 #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 5534 "LibraryWindow.c"
+#line 5947 "LibraryWindow.c"
 }
 
 
-static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* uris, const gchar* job_name, gboolean copy_to_library, gboolean recurse) {
+static void
+library_window_dispatch_import_jobs (LibraryWindow* self,
+                                     GSList* uris,
+                                     const gchar* job_name,
+                                     gboolean copy_to_library,
+                                     gboolean recurse)
+{
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_;
 	GFile* _tmp2_;
@@ -5543,11 +5962,10 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	const gchar* _tmp5_;
 	gboolean _tmp6_;
 	GeeArrayList* jobs = NULL;
-	GeeArrayList* _tmp15_;
-	GSList* _tmp16_;
-	GeeArrayList* _tmp30_;
-	gint _tmp31_;
-	gint _tmp32_;
+	GeeArrayList* _tmp14_;
+	GeeArrayList* _tmp26_;
+	gint _tmp27_;
+	gint _tmp28_;
 #line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5570,21 +5988,21 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	_g_object_unref0 (_tmp2_);
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
-#line 5574 "LibraryWindow.c"
+#line 5992 "LibraryWindow.c"
 		gboolean _tmp7_;
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
-#line 5580 "LibraryWindow.c"
+#line 5998 "LibraryWindow.c"
 	} else {
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 5584 "LibraryWindow.c"
+#line 6002 "LibraryWindow.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 5588 "LibraryWindow.c"
+#line 6006 "LibraryWindow.c"
 		GtkResponseType response = 0;
 		gchar* _tmp8_;
 		gchar* _tmp9_;
@@ -5592,7 +6010,6 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 		AppWindow* _tmp11_;
 		GtkResponseType _tmp12_;
 		GtkResponseType _tmp13_;
-		GtkResponseType _tmp14_;
 #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_strdup_printf (_ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \
 "s</span>.\n" "Do you want to continue importing photos?"), "▸");
@@ -5604,80 +6021,74 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 		_tmp11_ = _tmp10_;
 #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = app_window_affirm_cancel_question (_tmp9_, _ ("_Import"), _ ("Library Location"), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = _tmp12_;
 #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
 #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp9_);
 #line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		response = _tmp13_;
+		response = _tmp12_;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = response;
+		_tmp13_ = response;
 #line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp14_ == GTK_RESPONSE_CANCEL) {
+		if (_tmp13_ == GTK_RESPONSE_CANCEL) {
 #line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
-#line 5621 "LibraryWindow.c"
+#line 6036 "LibraryWindow.c"
 		}
 #line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
-#line 5625 "LibraryWindow.c"
+#line 6040 "LibraryWindow.c"
 	}
 #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
+	_tmp14_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, (GDestroyNotify) batch_import_job_unref, NULL, NULL, NULL);
 #line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	jobs = _tmp15_;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = uris;
-#line 5633 "LibraryWindow.c"
+	jobs = _tmp14_;
+#line 6046 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
 #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		uri_collection = _tmp16_;
+		uri_collection = uris;
 #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 5641 "LibraryWindow.c"
-			gchar* _tmp17_;
+#line 6054 "LibraryWindow.c"
+			gchar* _tmp15_;
 			gchar* uri = NULL;
 #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp17_ = g_strdup ((const gchar*) uri_it->data);
+			_tmp15_ = g_strdup ((const gchar*) uri_it->data);
 #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			uri = _tmp17_;
-#line 5648 "LibraryWindow.c"
+			uri = _tmp15_;
+#line 6061 "LibraryWindow.c"
 			{
 				GFile* file_or_dir = NULL;
-				const gchar* _tmp18_;
-				GFile* _tmp19_;
-				GFile* _tmp20_;
-				gchar* _tmp21_;
-				gchar* _tmp22_;
-				gboolean _tmp23_;
-				GeeArrayList* _tmp24_;
-				GFile* _tmp25_;
-				gboolean _tmp26_;
-				gboolean _tmp27_;
-				FileImportJob* _tmp28_;
-				FileImportJob* _tmp29_;
+				const gchar* _tmp16_;
+				GFile* _tmp17_;
+				GFile* _tmp18_;
+				gchar* _tmp19_;
+				gchar* _tmp20_;
+				gboolean _tmp21_;
+				GeeArrayList* _tmp22_;
+				GFile* _tmp23_;
+				FileImportJob* _tmp24_;
+				FileImportJob* _tmp25_;
 #line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp18_ = uri;
+				_tmp16_ = uri;
 #line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp19_ = g_file_new_for_uri (_tmp18_);
+				_tmp17_ = g_file_new_for_uri (_tmp16_);
 #line 792 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				file_or_dir = _tmp19_;
+				file_or_dir = _tmp17_;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp20_ = file_or_dir;
+				_tmp18_ = file_or_dir;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp21_ = g_file_get_path (_tmp20_);
+				_tmp19_ = g_file_get_path (_tmp18_);
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp22_ = _tmp21_;
+				_tmp20_ = _tmp19_;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp23_ = _tmp22_ == NULL;
+				_tmp21_ = _tmp20_ == NULL;
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_g_free0 (_tmp22_);
+				_g_free0 (_tmp20_);
 #line 793 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				if (_tmp23_) {
+				if (_tmp21_) {
 #line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					app_window_error_message (_ ("Photos cannot be imported from this directory."), NULL);
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5686,71 +6097,66 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 					_g_free0 (uri);
 #line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
-#line 5689 "LibraryWindow.c"
+#line 6100 "LibraryWindow.c"
 				}
 #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp24_ = jobs;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp25_ = file_or_dir;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp26_ = copy_to_library;
+				_tmp22_ = jobs;
 #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp27_ = recurse;
+				_tmp23_ = file_or_dir;
 #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp28_ = file_import_job_new (_tmp25_, _tmp26_, _tmp27_);
+				_tmp24_ = file_import_job_new (_tmp23_, copy_to_library, recurse);
 #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp29_ = _tmp28_;
+				_tmp25_ = _tmp24_;
 #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
+				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
 #line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_batch_import_job_unref0 (_tmp29_);
+				_batch_import_job_unref0 (_tmp25_);
 #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (file_or_dir);
 #line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 5711 "LibraryWindow.c"
+#line 6118 "LibraryWindow.c"
 			}
 		}
 	}
 #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = jobs;
+	_tmp26_ = jobs;
 #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = _tmp31_;
+	_tmp28_ = _tmp27_;
 #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp32_ > 0) {
-#line 5723 "LibraryWindow.c"
+	if (_tmp28_ > 0) {
+#line 6130 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
-		GeeArrayList* _tmp33_;
-		const gchar* _tmp34_;
-		BatchImport* _tmp35_;
-		BatchImport* _tmp36_;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp33_ = jobs;
+		GeeArrayList* _tmp29_;
+		BatchImport* _tmp30_;
+		BatchImport* _tmp31_;
 #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp34_ = job_name;
+		_tmp29_ = jobs;
 #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp35_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ITERABLE, GeeIterable), _tmp34_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
+		_tmp30_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable), job_name, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
 #line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		batch_import = _tmp35_;
+		batch_import = _tmp30_;
 #line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp36_ = batch_import;
+		_tmp31_ = batch_import;
 #line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_enqueue_batch_import (self, _tmp36_, TRUE);
+		library_window_enqueue_batch_import (self, _tmp31_, TRUE);
 #line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
 #line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
-#line 5745 "LibraryWindow.c"
+#line 6149 "LibraryWindow.c"
 	}
 #line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
-#line 5749 "LibraryWindow.c"
+#line 6153 "LibraryWindow.c"
 }
 
 
-static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
+static GdkDragAction
+library_window_get_drag_action (LibraryWindow* self)
+{
 	GdkDragAction result = 0;
 	GdkModifierType mask = 0;
 	GdkWindow* _tmp0_;
@@ -5797,31 +6203,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	_tmp10_ = ctrl;
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
-#line 5800 "LibraryWindow.c"
+#line 6206 "LibraryWindow.c"
 		gboolean _tmp11_;
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
-#line 5806 "LibraryWindow.c"
+#line 6212 "LibraryWindow.c"
 	} else {
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
-#line 5810 "LibraryWindow.c"
+#line 6216 "LibraryWindow.c"
 	}
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 5814 "LibraryWindow.c"
+#line 6220 "LibraryWindow.c"
 		gboolean _tmp12_;
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
-#line 5820 "LibraryWindow.c"
+#line 6226 "LibraryWindow.c"
 	} else {
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
-#line 5824 "LibraryWindow.c"
+#line 6230 "LibraryWindow.c"
 	}
 #line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
@@ -5829,7 +6235,7 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 		result = GDK_ACTION_COPY;
 #line 821 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5832 "LibraryWindow.c"
+#line 6238 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
@@ -5838,31 +6244,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 		_tmp15_ = ctrl;
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
-#line 5841 "LibraryWindow.c"
+#line 6247 "LibraryWindow.c"
 			gboolean _tmp16_;
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
-#line 5847 "LibraryWindow.c"
+#line 6253 "LibraryWindow.c"
 		} else {
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
-#line 5851 "LibraryWindow.c"
+#line 6257 "LibraryWindow.c"
 		}
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
-#line 5855 "LibraryWindow.c"
+#line 6261 "LibraryWindow.c"
 			gboolean _tmp17_;
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
-#line 5861 "LibraryWindow.c"
+#line 6267 "LibraryWindow.c"
 		} else {
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
-#line 5865 "LibraryWindow.c"
+#line 6271 "LibraryWindow.c"
 		}
 #line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp13_) {
@@ -5870,7 +6276,7 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 			result = GDK_ACTION_ASK;
 #line 823 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5873 "LibraryWindow.c"
+#line 6279 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
@@ -5879,31 +6285,31 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 			_tmp20_ = ctrl;
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
-#line 5882 "LibraryWindow.c"
+#line 6288 "LibraryWindow.c"
 				gboolean _tmp21_;
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
-#line 5888 "LibraryWindow.c"
+#line 6294 "LibraryWindow.c"
 			} else {
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
-#line 5892 "LibraryWindow.c"
+#line 6298 "LibraryWindow.c"
 			}
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
-#line 5896 "LibraryWindow.c"
+#line 6302 "LibraryWindow.c"
 				gboolean _tmp22_;
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
-#line 5902 "LibraryWindow.c"
+#line 6308 "LibraryWindow.c"
 			} else {
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
-#line 5906 "LibraryWindow.c"
+#line 6312 "LibraryWindow.c"
 			}
 #line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp18_) {
@@ -5911,126 +6317,106 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 				result = GDK_ACTION_LINK;
 #line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5914 "LibraryWindow.c"
+#line 6320 "LibraryWindow.c"
 			} else {
 #line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
 #line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 5920 "LibraryWindow.c"
+#line 6326 "LibraryWindow.c"
 			}
 		}
 	}
 }
 
 
-static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext* context, gint x, gint y, guint time) {
+static gboolean
+library_window_real_drag_motion (GtkWidget* base,
+                                 GdkDragContext* context,
+                                 gint x,
+                                 gint y,
+                                 guint time)
+{
 	LibraryWindow * self;
 	gboolean result = FALSE;
 	GdkAtom target = 0U;
-	GdkDragContext* _tmp0_;
-	GtkTargetList* _tmp1_;
+	GtkTargetList* _tmp0_;
+	GdkAtom _tmp1_;
 	GdkAtom _tmp2_;
-	GdkAtom _tmp3_;
-	GdkAtom _tmp4_;
-	GdkDragContext* _tmp7_;
-	GtkWidget* _tmp8_;
+	GtkWidget* _tmp3_;
 	GdkDragAction drag_action = 0;
-	GdkDragAction _tmp11_;
-	GdkDragAction _tmp12_;
-	GdkDragContext* _tmp13_;
-	GdkDragAction _tmp14_;
-	guint _tmp15_;
+	GdkDragAction _tmp4_;
+	GdkDragAction _tmp5_;
 #line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 830 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
 #line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = context;
+	_tmp0_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_);
-#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	target = _tmp2_;
+	target = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), context, _tmp0_);
 #line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = target;
+	_tmp1_ = target;
 #line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = GDK_NONE;
+	_tmp2_ = GDK_NONE;
 #line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ == _tmp4_) {
-#line 5962 "LibraryWindow.c"
-		GdkDragContext* _tmp5_;
-		guint _tmp6_;
+	if (_tmp1_ == _tmp2_) {
 #line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:833: drag target is GDK_NONE");
 #line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = context;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = time;
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_);
+		gdk_drag_status (context, 0, (guint32) time);
 #line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
 #line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5977 "LibraryWindow.c"
+#line 6372 "LibraryWindow.c"
 	}
 #line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = context;
-#line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = gtk_drag_get_source_widget (_tmp7_);
+	_tmp3_ = gtk_drag_get_source_widget (context);
 #line 840 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp8_ != NULL) {
-#line 5985 "LibraryWindow.c"
-		GdkDragContext* _tmp9_;
-		guint _tmp10_;
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = context;
-#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = time;
+	if (_tmp3_ != NULL) {
 #line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_);
+		gdk_drag_status (context, GDK_ACTION_PRIVATE, (guint32) time);
 #line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
 #line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5998 "LibraryWindow.c"
+#line 6384 "LibraryWindow.c"
 	}
 #line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = library_window_get_drag_action (self);
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	drag_action = _tmp11_;
+	drag_action = library_window_get_drag_action (self);
 #line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = drag_action;
+	_tmp4_ = drag_action;
 #line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp12_ == GDK_ACTION_DEFAULT) {
+	if (_tmp4_ == GDK_ACTION_DEFAULT) {
 #line 850 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
-#line 6010 "LibraryWindow.c"
+#line 6394 "LibraryWindow.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = context;
+	_tmp5_ = drag_action;
 #line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = drag_action;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = time;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_);
+	gdk_drag_status (context, _tmp5_, (guint32) time);
 #line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
 #line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6024 "LibraryWindow.c"
+#line 6404 "LibraryWindow.c"
 }
 
 
-static void library_window_real_drag_data_received (GtkWidget* base, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time) {
+static void
+library_window_real_drag_data_received (GtkWidget* base,
+                                        GdkDragContext* context,
+                                        gint x,
+                                        gint y,
+                                        GtkSelectionData* selection_data,
+                                        guint info,
+                                        guint time)
+{
 	LibraryWindow * self;
-	GtkSelectionData* _tmp0_;
-	guchar* _tmp1_;
-	GdkDragContext* _tmp2_;
-	GtkWidget* _tmp3_;
+	guint8* _tmp0_;
+	GtkWidget* _tmp1_;
 #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6038,69 +6424,48 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 #line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (selection_data != NULL);
 #line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = selection_data;
-#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = gtk_selection_data_get_data (_tmp0_);
+	_tmp0_ = gtk_selection_data_get_data (selection_data);
 #line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (-1 < 0) {
 #line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_debug ("LibraryWindow.vala:860: failed to retrieve SelectionData");
-#line 6048 "LibraryWindow.c"
+#line 6432 "LibraryWindow.c"
 	}
 #line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = context;
-#line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = gtk_drag_get_source_widget (_tmp2_);
+	_tmp1_ = gtk_drag_get_source_widget (context);
 #line 864 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ == NULL) {
-#line 6056 "LibraryWindow.c"
-		GdkDragContext* _tmp4_;
-		GtkSelectionData* _tmp5_;
-		guint _tmp6_;
-		guint _tmp7_;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = context;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = selection_data;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = info;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = time;
+	if (_tmp1_ == NULL) {
 #line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 6071 "LibraryWindow.c"
+		library_window_external_drop_handler (self, context, NULL, selection_data, info, time);
+#line 6440 "LibraryWindow.c"
 	} else {
-		GdkDragContext* _tmp8_;
-		guint _tmp9_;
 #line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = context;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = time;
-#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 6081 "LibraryWindow.c"
+		gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
+#line 6444 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_external_drop_handler (LibraryWindow* self, GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time) {
+static void
+library_window_external_drop_handler (LibraryWindow* self,
+                                      GdkDragContext* context,
+                                      SidebarEntry* entry,
+                                      GtkSelectionData* data,
+                                      guint info,
+                                      guint time)
+{
 	gchar** uris_array = NULL;
-	GtkSelectionData* _tmp0_;
+	gchar** _tmp0_;
 	gchar** _tmp1_;
-	gchar** _tmp2_;
 	gint uris_array_length1;
 	gint _uris_array_size_;
 	GSList* uris = NULL;
-	gchar** _tmp3_;
-	gint _tmp3__length1;
+	gchar** _tmp2_;
+	gint _tmp2__length1;
 	GdkDragAction selected_action = 0;
-	GdkDragContext* _tmp7_;
-	GdkDragAction _tmp8_;
-	GdkDragAction _tmp9_;
-	GSList* _tmp21_;
-	GdkDragAction _tmp22_;
-	GdkDragContext* _tmp23_;
-	guint _tmp24_;
+	GdkDragAction _tmp6_;
+	GSList* _tmp14_;
+	GdkDragAction _tmp15_;
 #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6110,193 +6475,172 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (data != NULL);
 #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = data;
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_);
+	_tmp1_ = _tmp0_ = gtk_selection_data_get_uris (data);
 #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	uris_array = _tmp2_;
+	uris_array = _tmp1_;
 #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	uris_array_length1 = _vala_array_length (_tmp1_);
+	uris_array_length1 = _vala_array_length (_tmp0_);
 #line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_uris_array_size_ = uris_array_length1;
 #line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris = NULL;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = uris_array;
+	_tmp2_ = uris_array;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3__length1 = uris_array_length1;
-#line 6128 "LibraryWindow.c"
+	_tmp2__length1 = uris_array_length1;
+#line 6491 "LibraryWindow.c"
 	{
 		gchar** uri_collection = NULL;
 		gint uri_collection_length1 = 0;
 		gint _uri_collection_size_ = 0;
 		gint uri_it = 0;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		uri_collection = _tmp3_;
+		uri_collection = _tmp2_;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		uri_collection_length1 = _tmp3__length1;
+		uri_collection_length1 = _tmp2__length1;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 6140 "LibraryWindow.c"
-			gchar* _tmp4_;
+		for (uri_it = 0; uri_it < _tmp2__length1; uri_it = uri_it + 1) {
+#line 6503 "LibraryWindow.c"
+			gchar* _tmp3_;
 			gchar* uri = NULL;
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp4_ = g_strdup (uri_collection[uri_it]);
+			_tmp3_ = g_strdup (uri_collection[uri_it]);
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			uri = _tmp4_;
-#line 6147 "LibraryWindow.c"
+			uri = _tmp3_;
+#line 6510 "LibraryWindow.c"
 			{
-				const gchar* _tmp5_;
-				gchar* _tmp6_;
+				const gchar* _tmp4_;
+				gchar* _tmp5_;
 #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp5_ = uri;
+				_tmp4_ = uri;
 #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp6_ = g_strdup (_tmp5_);
+				_tmp5_ = g_strdup (_tmp4_);
 #line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				uris = g_slist_append (uris, _tmp6_);
+				uris = g_slist_append (uris, _tmp5_);
 #line 875 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 6159 "LibraryWindow.c"
+#line 6522 "LibraryWindow.c"
 			}
 		}
 	}
 #line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = context;
-#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = gdk_drag_context_get_selected_action (_tmp7_);
-#line 878 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	selected_action = _tmp8_;
+	selected_action = gdk_drag_context_get_selected_action (context);
 #line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = selected_action;
+	_tmp6_ = selected_action;
 #line 879 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp9_ == GDK_ACTION_ASK) {
-#line 6173 "LibraryWindow.c"
+	if (_tmp6_ == GDK_ACTION_ASK) {
+#line 6532 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
-		GSList* _tmp10_;
-		GtkResponseType _tmp18_;
+		GSList* _tmp7_;
+		GtkResponseType _tmp13_;
 #line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_result_ = GTK_RESPONSE_REJECT;
 #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = uris;
-#line 6181 "LibraryWindow.c"
+		_tmp7_ = uris;
+#line 6540 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
 #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			uri_collection = _tmp10_;
+			uri_collection = _tmp7_;
 #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6189 "LibraryWindow.c"
-				gchar* _tmp11_;
+#line 6548 "LibraryWindow.c"
+				gchar* _tmp8_;
 				gchar* uri = NULL;
 #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp11_ = g_strdup ((const gchar*) uri_it->data);
+				_tmp8_ = g_strdup ((const gchar*) uri_it->data);
 #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				uri = _tmp11_;
-#line 6196 "LibraryWindow.c"
+				uri = _tmp8_;
+#line 6555 "LibraryWindow.c"
 				{
-					const gchar* _tmp12_;
-					GFile* _tmp13_;
-					GFile* _tmp14_;
-					gboolean _tmp15_;
-					gboolean _tmp16_;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					_tmp12_ = uri;
+					const gchar* _tmp9_;
+					GFile* _tmp10_;
+					GFile* _tmp11_;
+					gboolean _tmp12_;
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					_tmp13_ = g_file_new_for_uri (_tmp12_);
+					_tmp9_ = uri;
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					_tmp14_ = _tmp13_;
+					_tmp10_ = g_file_new_for_uri (_tmp9_);
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
+					_tmp11_ = _tmp10_;
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					_tmp16_ = !_tmp15_;
+					_tmp12_ = !app_dirs_is_in_import_dir (_tmp11_);
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					_g_object_unref0 (_tmp14_);
+					_g_object_unref0 (_tmp11_);
 #line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-					if (_tmp16_) {
-#line 6217 "LibraryWindow.c"
-						GtkResponseType _tmp17_;
+					if (_tmp12_) {
 #line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-						_tmp17_ = copy_files_dialog ();
-#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-						_result_ = _tmp17_;
+						_result_ = copy_files_dialog ();
 #line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_g_free0 (uri);
 #line 886 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
-#line 6227 "LibraryWindow.c"
+#line 6579 "LibraryWindow.c"
 					}
 #line 882 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 6231 "LibraryWindow.c"
+#line 6583 "LibraryWindow.c"
 				}
 			}
 		}
 #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp18_ = _result_;
+		_tmp13_ = _result_;
 #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		switch (_tmp18_) {
+		switch (_tmp13_) {
 #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
-#line 6241 "LibraryWindow.c"
+#line 6593 "LibraryWindow.c"
 			{
 #line 892 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_COPY;
 #line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6247 "LibraryWindow.c"
+#line 6599 "LibraryWindow.c"
 			}
 #line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
-#line 6251 "LibraryWindow.c"
+#line 6603 "LibraryWindow.c"
 			{
 #line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_LINK;
 #line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 6257 "LibraryWindow.c"
+#line 6609 "LibraryWindow.c"
 			}
 			default:
 			{
-				GdkDragContext* _tmp19_;
-				guint _tmp20_;
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp19_ = context;
 #line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				_tmp20_ = time;
-#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-				gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_);
+				gtk_drag_finish (context, FALSE, FALSE, (guint32) time);
 #line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				__g_slist_free__g_free0_0 (uris);
 #line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
 #line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
-#line 6275 "LibraryWindow.c"
+#line 6621 "LibraryWindow.c"
 			}
 		}
 	}
 #line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = uris;
+	_tmp14_ = uris;
 #line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = selected_action;
+	_tmp15_ = selected_action;
 #line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY, TRUE);
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = context;
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = time;
+	library_window_dispatch_import_jobs (self, _tmp14_, "drag-and-drop", _tmp15_ == GDK_ACTION_COPY, TRUE);
 #line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_);
+	gtk_drag_finish (context, TRUE, FALSE, (guint32) time);
 #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	__g_slist_free__g_free0_0 (uris);
 #line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 6295 "LibraryWindow.c"
+#line 6637 "LibraryWindow.c"
 }
 
 
-void library_window_switch_to_library_page (LibraryWindow* self) {
+void
+library_window_switch_to_library_page (LibraryWindow* self)
+{
 	LibraryBranch* _tmp0_;
 	LibraryPhotosEntry* _tmp1_;
 	LibraryPhotosEntry* _tmp2_;
@@ -6318,16 +6662,18 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
 	library_window_switch_to_page (self, _tmp4_);
 #line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6321 "LibraryWindow.c"
+#line 6665 "LibraryWindow.c"
 }
 
 
-void library_window_switch_to_event (LibraryWindow* self, Event* event) {
+void
+library_window_switch_to_event (LibraryWindow* self,
+                                Event* event)
+{
 	EventsEventEntry* entry = NULL;
 	EventsBranch* _tmp0_;
-	Event* _tmp1_;
+	EventsEventEntry* _tmp1_;
 	EventsEventEntry* _tmp2_;
-	EventsEventEntry* _tmp3_;
 #line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6335,43 +6681,43 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
 #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = event;
+	_tmp1_ = events_branch_get_entry_for_event (_tmp0_, event);
 #line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = entry;
+	_tmp2_ = entry;
 #line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ != NULL) {
-#line 6347 "LibraryWindow.c"
-		EventsEventEntry* _tmp4_;
+	if (_tmp2_ != NULL) {
+#line 6691 "LibraryWindow.c"
+		EventsEventEntry* _tmp3_;
+		Page* _tmp4_;
 		Page* _tmp5_;
-		Page* _tmp6_;
 #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = entry;
+		_tmp3_ = entry;
 #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp6_);
+		library_window_switch_to_page (self, _tmp5_);
 #line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp6_);
-#line 6361 "LibraryWindow.c"
+		_g_object_unref0 (_tmp5_);
+#line 6705 "LibraryWindow.c"
 	}
 #line 916 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6365 "LibraryWindow.c"
+#line 6709 "LibraryWindow.c"
 }
 
 
-void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
+void
+library_window_switch_to_tag (LibraryWindow* self,
+                              Tag* tag)
+{
 	TagsSidebarEntry* entry = NULL;
 	TagsBranch* _tmp0_;
-	Tag* _tmp1_;
+	TagsSidebarEntry* _tmp1_;
 	TagsSidebarEntry* _tmp2_;
-	TagsSidebarEntry* _tmp3_;
 #line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6379,43 +6725,43 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
 #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = tag;
-#line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
+	_tmp1_ = tags_branch_get_entry_for_tag (_tmp0_, tag);
 #line 923 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = entry;
+	_tmp2_ = entry;
 #line 924 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ != NULL) {
-#line 6391 "LibraryWindow.c"
-		TagsSidebarEntry* _tmp4_;
+	if (_tmp2_ != NULL) {
+#line 6735 "LibraryWindow.c"
+		TagsSidebarEntry* _tmp3_;
+		Page* _tmp4_;
 		Page* _tmp5_;
-		Page* _tmp6_;
 #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = entry;
+		_tmp3_ = entry;
 #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp6_);
+		library_window_switch_to_page (self, _tmp5_);
 #line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp6_);
-#line 6405 "LibraryWindow.c"
+		_g_object_unref0 (_tmp5_);
+#line 6749 "LibraryWindow.c"
 	}
 #line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6409 "LibraryWindow.c"
+#line 6753 "LibraryWindow.c"
 }
 
 
-void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* search) {
+void
+library_window_switch_to_saved_search (LibraryWindow* self,
+                                       SavedSearch* search)
+{
 	SearchesSidebarEntry* entry = NULL;
 	SearchesBranch* _tmp0_;
-	SavedSearch* _tmp1_;
+	SearchesSidebarEntry* _tmp1_;
 	SearchesSidebarEntry* _tmp2_;
-	SearchesSidebarEntry* _tmp3_;
 #line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6423,49 +6769,47 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
 #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = search;
-#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
+	_tmp1_ = searches_branch_get_entry_for_saved_search (_tmp0_, search);
 #line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = entry;
+	_tmp2_ = entry;
 #line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ != NULL) {
-#line 6435 "LibraryWindow.c"
-		SearchesSidebarEntry* _tmp4_;
+	if (_tmp2_ != NULL) {
+#line 6779 "LibraryWindow.c"
+		SearchesSidebarEntry* _tmp3_;
+		Page* _tmp4_;
 		Page* _tmp5_;
-		Page* _tmp6_;
 #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = entry;
+		_tmp3_ = entry;
 #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp6_);
+		library_window_switch_to_page (self, _tmp5_);
 #line 931 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp6_);
-#line 6449 "LibraryWindow.c"
+		_g_object_unref0 (_tmp5_);
+#line 6793 "LibraryWindow.c"
 	}
 #line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6453 "LibraryWindow.c"
+#line 6797 "LibraryWindow.c"
 }
 
 
-void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current) {
-	CollectionPage* _tmp0_;
+void
+library_window_switch_to_photo_page (LibraryWindow* self,
+                                     CollectionPage* controller,
+                                     Photo* current)
+{
+	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	ViewCollection* _tmp2_;
-	Photo* _tmp3_;
-	DataView* _tmp4_;
-	DataView* _tmp5_;
-	LibraryPhotoPage* _tmp6_;
-	LibraryPhotoPage* _tmp9_;
-	CollectionPage* _tmp10_;
-	Photo* _tmp11_;
-	LibraryPhotoPage* _tmp12_;
+	DataView* _tmp2_;
+	DataView* _tmp3_;
+	LibraryPhotoPage* _tmp4_;
+	LibraryPhotoPage* _tmp7_;
+	LibraryPhotoPage* _tmp8_;
 #line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6473,63 +6817,57 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 #line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PHOTO (current));
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = controller;
+	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (controller, TYPE_PAGE, Page));
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _tmp1_;
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = current;
+	_tmp1_ = _tmp0_;
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource));
+	_tmp2_ = view_collection_get_view_for_source (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (current, TYPE_DATA_SOURCE, DataSource));
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = _tmp2_;
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null");
+	_vala_assert (_tmp3_ != NULL, "controller.get_view().get_view_for_source(current) != null");
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp3_);
 #line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_data_collection_unref0 (_tmp2_);
+	_data_collection_unref0 (_tmp1_);
 #line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = self->priv->photo_page;
+	_tmp4_ = self->priv->photo_page;
 #line 936 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp6_ == NULL) {
-#line 6497 "LibraryWindow.c"
-		LibraryPhotoPage* _tmp7_;
-		LibraryPhotoPage* _tmp8_;
+	if (_tmp4_ == NULL) {
+#line 6837 "LibraryWindow.c"
+		LibraryPhotoPage* _tmp5_;
+		LibraryPhotoPage* _tmp6_;
 #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = library_photo_page_new ();
+		_tmp5_ = library_photo_page_new ();
 #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_object_ref_sink (_tmp7_);
+		g_object_ref_sink (_tmp5_);
 #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (self->priv->photo_page);
 #line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		self->priv->photo_page = _tmp7_;
+		self->priv->photo_page = _tmp5_;
 #line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = self->priv->photo_page;
+		_tmp6_ = self->priv->photo_page;
 #line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
+		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE, Page));
 #line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
-#line 6514 "LibraryWindow.c"
+#line 6854 "LibraryWindow.c"
 	}
 #line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = self->priv->photo_page;
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = controller;
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = current;
+	_tmp7_ = self->priv->photo_page;
 #line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL);
+	library_photo_page_display_for_collection (_tmp7_, controller, current, NULL);
 #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = self->priv->photo_page;
+	_tmp8_ = self->priv->photo_page;
 #line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 6528 "LibraryWindow.c"
+	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
+#line 6864 "LibraryWindow.c"
 }
 
 
-void library_window_switch_to_import_queue_page (LibraryWindow* self) {
+void
+library_window_switch_to_import_queue_page (LibraryWindow* self)
+{
 	LibraryBranch* _tmp0_;
 	LibraryImportQueueSidebarEntry* _tmp1_;
 	LibraryImportQueueSidebarEntry* _tmp2_;
@@ -6551,26 +6889,27 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
 	library_window_switch_to_page (self, _tmp4_);
 #line 950 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6554 "LibraryWindow.c"
+#line 6892 "LibraryWindow.c"
 }
 
 
-static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamera* camera) {
+static void
+library_window_on_camera_added (LibraryWindow* self,
+                                DiscoveredCamera* camera)
+{
 	CameraSidebarEntry* entry = NULL;
 	CameraBranch* _tmp0_;
-	DiscoveredCamera* _tmp1_;
+	CameraSidebarEntry* _tmp1_;
 	CameraSidebarEntry* _tmp2_;
-	CameraSidebarEntry* _tmp3_;
 	ImportPage* page = NULL;
-	CameraSidebarEntry* _tmp4_;
-	Page* _tmp5_;
+	CameraSidebarEntry* _tmp3_;
+	Page* _tmp4_;
 	GFile* uri_file = NULL;
-	DiscoveredCamera* _tmp6_;
-	const gchar* _tmp7_;
-	GFile* _tmp8_;
+	const gchar* _tmp5_;
+	GFile* _tmp6_;
 	GMount* mount = NULL;
-	gboolean _tmp13_ = FALSE;
-	GMount* _tmp14_;
+	gboolean _tmp11_ = FALSE;
+	GMount* _tmp12_;
 	GError * _inner_error_ = NULL;
 #line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -6579,65 +6918,61 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 #line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->camera_branch;
 #line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = camera;
+	_tmp1_ = camera_branch_get_entry_for_camera (_tmp0_, camera);
 #line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_);
-#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = _tmp2_;
+	entry = _tmp1_;
 #line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = entry;
+	_tmp2_ = entry;
 #line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6595 "LibraryWindow.c"
+#line 6932 "LibraryWindow.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = entry;
+	_tmp3_ = entry;
 #line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+	_tmp4_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage);
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_IMPORT_PAGE, ImportPage);
 #line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = camera;
+	_tmp5_ = camera->uri;
 #line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _tmp6_->uri;
+	_tmp6_ = g_file_new_for_uri (_tmp5_);
 #line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 959 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	uri_file = _tmp8_;
+	uri_file = _tmp6_;
 #line 962 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 6613 "LibraryWindow.c"
+#line 6948 "LibraryWindow.c"
 	{
-		GMount* _tmp9_ = NULL;
-		GFile* _tmp10_;
-		GMount* _tmp11_;
-		GMount* _tmp12_;
+		GMount* _tmp7_ = NULL;
+		GFile* _tmp8_;
+		GMount* _tmp9_;
+		GMount* _tmp10_;
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = uri_file;
+		_tmp8_ = uri_file;
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
+		_tmp9_ = g_file_find_enclosing_mount (_tmp8_, NULL, &_inner_error_);
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = _tmp11_;
+		_tmp7_ = _tmp9_;
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6627 "LibraryWindow.c"
+#line 6962 "LibraryWindow.c"
 			goto __catch46_g_error;
 		}
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = _tmp9_;
+		_tmp10_ = _tmp7_;
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = NULL;
+		_tmp7_ = NULL;
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
 #line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		mount = _tmp12_;
+		mount = _tmp10_;
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp9_);
-#line 6640 "LibraryWindow.c"
+		_g_object_unref0 (_tmp7_);
+#line 6975 "LibraryWindow.c"
 	}
 	goto __finally46;
 	__catch46_g_error:
@@ -6649,7 +6984,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_inner_error_ = NULL;
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 6652 "LibraryWindow.c"
+#line 6987 "LibraryWindow.c"
 	}
 	__finally46:
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6668,63 +7003,54 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		g_clear_error (&_inner_error_);
 #line 963 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6671 "LibraryWindow.c"
+#line 7006 "LibraryWindow.c"
 	}
 #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = mount;
+	_tmp12_ = mount;
 #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp14_ != NULL) {
-#line 6677 "LibraryWindow.c"
-		DiscoveredCamera* _tmp15_;
-		const gchar* _tmp16_;
-		gboolean _tmp17_;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = camera;
-#line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = _tmp15_->uri;
+	if (_tmp12_ != NULL) {
+#line 7012 "LibraryWindow.c"
+		const gchar* _tmp13_;
 #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = g_str_has_prefix (_tmp16_, "file://");
+		_tmp13_ = camera->uri;
 #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = !_tmp17_;
-#line 6689 "LibraryWindow.c"
+		_tmp11_ = !g_str_has_prefix (_tmp13_, "file://");
+#line 7018 "LibraryWindow.c"
 	} else {
 #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = FALSE;
-#line 6693 "LibraryWindow.c"
+		_tmp11_ = FALSE;
+#line 7022 "LibraryWindow.c"
 	}
 #line 970 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp13_) {
-#line 6697 "LibraryWindow.c"
-		ImportPage* _tmp18_;
-		GMount* _tmp19_;
-		gboolean _tmp20_;
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp18_ = page;
+	if (_tmp11_) {
+#line 7026 "LibraryWindow.c"
+		ImportPage* _tmp14_;
+		GMount* _tmp15_;
 #line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp19_ = mount;
+		_tmp14_ = page;
 #line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
+		_tmp15_ = mount;
 #line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp20_) {
-#line 6709 "LibraryWindow.c"
-			ImportPage* _tmp21_;
+		if (import_page_unmount_camera (_tmp14_, _tmp15_)) {
+#line 7035 "LibraryWindow.c"
+			ImportPage* _tmp16_;
 #line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp21_ = page;
+			_tmp16_ = page;
 #line 972 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 6715 "LibraryWindow.c"
+			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
+#line 7041 "LibraryWindow.c"
 		} else {
 #line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 6719 "LibraryWindow.c"
+#line 7045 "LibraryWindow.c"
 		}
 	} else {
-		ImportPage* _tmp22_;
+		ImportPage* _tmp17_;
 #line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp22_ = page;
+		_tmp17_ = page;
 #line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 6727 "LibraryWindow.c"
+		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PAGE, Page));
+#line 7053 "LibraryWindow.c"
 	}
 #line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
@@ -6734,41 +7060,40 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	_g_object_unref0 (page);
 #line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 6737 "LibraryWindow.c"
+#line 7063 "LibraryWindow.c"
 }
 
 
-void library_window_add_to_stack (LibraryWindow* self, Page* page) {
-	Page* _tmp0_;
+void
+library_window_add_to_stack (LibraryWindow* self,
+                             Page* page)
+{
+	GtkStack* _tmp0_;
 	GtkStack* _tmp1_;
-	Page* _tmp2_;
-	GtkStack* _tmp3_;
 #line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
 #line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = self->priv->stack;
-#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = page;
+	_tmp0_ = self->priv->stack;
 #line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
 #line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = self->priv->stack;
+	_tmp1_ = self->priv->stack;
 #line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 6764 "LibraryWindow.c"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 7087 "LibraryWindow.c"
 }
 
 
-static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
+static void
+library_window_remove_from_stack (LibraryWindow* self,
+                                  Page* page)
+{
 	GtkStack* _tmp0_;
-	Page* _tmp1_;
-	GtkStack* _tmp2_;
+	GtkStack* _tmp1_;
 #line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 990 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6776,46 +7101,54 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
 #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
 #line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
 #line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = self->priv->stack;
+	_tmp1_ = self->priv->stack;
 #line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 6786 "LibraryWindow.c"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
+#line 7109 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new10 (gboolean value) {
+static GVariant*
+_variant_new10 (gboolean value)
+{
 #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6793 "LibraryWindow.c"
+#line 7118 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new11 (gboolean value) {
+static GVariant*
+_variant_new11 (gboolean value)
+{
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6800 "LibraryWindow.c"
+#line 7127 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new12 (gboolean value) {
+static GVariant*
+_variant_new12 (gboolean value)
+{
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 6807 "LibraryWindow.c"
+#line 7136 "LibraryWindow.c"
 }
 
 
-static GVariant* _variant_new13 (const gchar* value) {
+static GVariant*
+_variant_new13 (const gchar* value)
+{
 #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 6814 "LibraryWindow.c"
+#line 7145 "LibraryWindow.c"
 }
 
 
-static void library_window_load_configuration (LibraryWindow* self) {
+static void
+library_window_load_configuration (LibraryWindow* self)
+{
 	GAction* basic_display_action = NULL;
 	GAction* _tmp0_;
 	GAction* _tmp1_;
@@ -6823,39 +7156,35 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	GAction* _tmp3_;
 	ConfigFacade* _tmp4_;
 	ConfigFacade* _tmp5_;
-	gboolean _tmp6_;
-	GVariant* _tmp7_;
+	GVariant* _tmp6_;
 	GAction* extended_display_action = NULL;
+	GAction* _tmp7_;
 	GAction* _tmp8_;
 	GAction* _tmp9_;
 	GAction* _tmp10_;
-	GAction* _tmp11_;
+	ConfigFacade* _tmp11_;
 	ConfigFacade* _tmp12_;
-	ConfigFacade* _tmp13_;
-	gboolean _tmp14_;
-	GVariant* _tmp15_;
+	GVariant* _tmp13_;
 	GAction* search_bar_display_action = NULL;
+	GAction* _tmp14_;
+	GAction* _tmp15_;
 	GAction* _tmp16_;
 	GAction* _tmp17_;
-	GAction* _tmp18_;
-	GAction* _tmp19_;
-	ConfigFacade* _tmp20_;
-	ConfigFacade* _tmp21_;
-	gboolean _tmp22_;
-	GVariant* _tmp23_;
+	ConfigFacade* _tmp18_;
+	ConfigFacade* _tmp19_;
+	GVariant* _tmp20_;
 	GAction* sort_events_action = NULL;
-	GAction* _tmp24_;
-	GAction* _tmp25_;
-	GAction* _tmp26_;
-	const gchar* _tmp27_ = NULL;
-	ConfigFacade* _tmp28_;
-	ConfigFacade* _tmp29_;
-	gboolean _tmp30_;
-	gboolean _tmp31_;
+	GAction* _tmp21_;
+	GAction* _tmp22_;
+	GAction* _tmp23_;
+	const gchar* _tmp24_ = NULL;
+	ConfigFacade* _tmp25_;
+	ConfigFacade* _tmp26_;
+	gboolean _tmp27_;
 	gchar* event_sort_val = NULL;
-	gchar* _tmp32_;
-	GAction* _tmp33_;
-	GVariant* _tmp34_;
+	gchar* _tmp28_;
+	GAction* _tmp29_;
+	GVariant* _tmp30_;
 #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6875,109 +7204,101 @@ static void library_window_load_configuration (LibraryWindow* self) {
 #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
 #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _variant_new10 (_tmp6_);
+	_tmp6_ = _variant_new10 (configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp3_, _tmp7_);
+	g_action_change_state (_tmp3_, _tmp6_);
 #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp7_);
+	_g_variant_unref0 (_tmp6_);
 #line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
 #line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
+	_tmp7_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
 #line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = _g_object_ref0 (_tmp8_);
+	_tmp8_ = _g_object_ref0 (_tmp7_);
 #line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	extended_display_action = _tmp9_;
+	extended_display_action = _tmp8_;
 #line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = extended_display_action;
+	_tmp9_ = extended_display_action;
 #line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp10_ != NULL, "extended_display_action != null");
+	_vala_assert (_tmp9_ != NULL, "extended_display_action != null");
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = extended_display_action;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = config_facade_get_instance ();
+	_tmp10_ = extended_display_action;
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = _tmp12_;
+	_tmp11_ = config_facade_get_instance ();
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp12_ = _tmp11_;
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = _variant_new11 (_tmp14_);
+	_tmp13_ = _variant_new11 (configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp11_, _tmp15_);
+	g_action_change_state (_tmp10_, _tmp13_);
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp15_);
+	_g_variant_unref0 (_tmp13_);
 #line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp13_);
+	_g_object_unref0 (_tmp12_);
 #line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+	_tmp14_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
 #line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = _g_object_ref0 (_tmp16_);
+	_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	search_bar_display_action = _tmp17_;
+	search_bar_display_action = _tmp15_;
 #line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = search_bar_display_action;
+	_tmp16_ = search_bar_display_action;
 #line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp18_ != NULL, "search_bar_display_action != null");
-#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = search_bar_display_action;
+	_vala_assert (_tmp16_ != NULL, "search_bar_display_action != null");
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = config_facade_get_instance ();
+	_tmp17_ = search_bar_display_action;
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = _tmp20_;
+	_tmp18_ = config_facade_get_instance ();
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp19_ = _tmp18_;
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = _variant_new12 (_tmp22_);
+	_tmp20_ = _variant_new12 (configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp19_, _tmp23_);
+	g_action_change_state (_tmp17_, _tmp20_);
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp23_);
+	_g_variant_unref0 (_tmp20_);
 #line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp21_);
+	_g_object_unref0 (_tmp19_);
 #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
+	_tmp21_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
 #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp25_ = _g_object_ref0 (_tmp24_);
+	_tmp22_ = _g_object_ref0 (_tmp21_);
 #line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sort_events_action = _tmp25_;
+	sort_events_action = _tmp22_;
 #line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_ = sort_events_action;
+	_tmp23_ = sort_events_action;
 #line 1012 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp26_ != NULL, "sort_events_action != null");
+	_vala_assert (_tmp23_ != NULL, "sort_events_action != null");
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp28_ = config_facade_get_instance ();
+	_tmp25_ = config_facade_get_instance ();
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = _tmp28_;
+	_tmp26_ = _tmp25_;
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp27_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = _tmp30_;
+	_g_object_unref0 (_tmp26_);
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp29_);
+	if (_tmp27_) {
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp31_) {
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 6963 "LibraryWindow.c"
+		_tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
+#line 7284 "LibraryWindow.c"
 	} else {
 #line 1018 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6967 "LibraryWindow.c"
+		_tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
+#line 7288 "LibraryWindow.c"
 	}
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = g_strdup (_tmp27_);
+	_tmp28_ = g_strdup (_tmp24_);
 #line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	event_sort_val = _tmp32_;
+	event_sort_val = _tmp28_;
 #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = sort_events_action;
+	_tmp29_ = sort_events_action;
 #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = _variant_new13 (event_sort_val);
+	_tmp30_ = _variant_new13 (event_sort_val);
 #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_action_change_state (_tmp33_, _tmp34_);
+	g_action_change_state (_tmp29_, _tmp30_);
 #line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_variant_unref0 (_tmp34_);
+	_g_variant_unref0 (_tmp30_);
 #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (event_sort_val);
 #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6988,71 +7309,64 @@ static void library_window_load_configuration (LibraryWindow* self) {
 	_g_object_unref0 (extended_display_action);
 #line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
-#line 6991 "LibraryWindow.c"
+#line 7312 "LibraryWindow.c"
 }
 
 
-static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) {
+static gboolean
+_library_window_on_pulse_background_progress_bar_gsource_func (gpointer self)
+{
 	gboolean result;
 	result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self);
 #line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7000 "LibraryWindow.c"
+#line 7323 "LibraryWindow.c"
 }
 
 
-static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority) {
+static void
+library_window_start_pulse_background_progress_bar (LibraryWindow* self,
+                                                    const gchar* label,
+                                                    gint priority)
+{
 	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-	GtkProgressBar* _tmp4_;
-	const gchar* _tmp5_;
-	GtkProgressBar* _tmp6_;
-	guint _tmp7_;
+	GtkProgressBar* _tmp1_;
+	GtkProgressBar* _tmp2_;
 #line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
 #line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = priority;
-#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = self->priv->current_progress_priority;
+	_tmp0_ = self->priv->current_progress_priority;
 #line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp0_ < _tmp1_) {
+	if (priority < _tmp0_) {
 #line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7025 "LibraryWindow.c"
+#line 7345 "LibraryWindow.c"
 	}
 #line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = priority;
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = priority;
+	library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
 #line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->current_progress_priority = _tmp3_;
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = self->priv->background_progress_bar;
+	self->priv->current_progress_priority = priority;
 #line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = label;
+	_tmp1_ = self->priv->background_progress_bar;
 #line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
+	gtk_progress_bar_set_text (_tmp1_, label);
 #line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = self->priv->background_progress_bar;
+	_tmp2_ = self->priv->background_progress_bar;
 #line 1032 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_pulse (_tmp6_);
+	gtk_progress_bar_pulse (_tmp2_);
 #line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
 #line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref);
-#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_pulse_id = _tmp7_;
-#line 7051 "LibraryWindow.c"
+	self->priv->background_progress_pulse_id = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref);
+#line 7363 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
+static gboolean
+library_window_on_pulse_background_progress_bar (LibraryWindow* self)
+{
 	gboolean result = FALSE;
 	GtkProgressBar* _tmp0_;
 #line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7065,210 +7379,175 @@ static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow*
 	result = TRUE;
 #line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7068 "LibraryWindow.c"
+#line 7382 "LibraryWindow.c"
 }
 
 
-static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear) {
+static void
+library_window_stop_pulse_background_progress_bar (LibraryWindow* self,
+                                                   gint priority,
+                                                   gboolean clear)
+{
 	gint _tmp0_;
-	gint _tmp1_;
-	guint _tmp2_;
-	gboolean _tmp4_;
+	guint _tmp1_;
 #line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = priority;
-#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = self->priv->current_progress_priority;
+	_tmp0_ = self->priv->current_progress_priority;
 #line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp0_ < _tmp1_) {
+	if (priority < _tmp0_) {
 #line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7087 "LibraryWindow.c"
+#line 7401 "LibraryWindow.c"
 	}
 #line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = self->priv->background_progress_pulse_id;
+	_tmp1_ = self->priv->background_progress_pulse_id;
 #line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_ != ((guint) 0)) {
-#line 7093 "LibraryWindow.c"
-		guint _tmp3_;
+	if (_tmp1_ != ((guint) 0)) {
+#line 7407 "LibraryWindow.c"
+		guint _tmp2_;
 #line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = self->priv->background_progress_pulse_id;
+		_tmp2_ = self->priv->background_progress_pulse_id;
 #line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_source_remove (_tmp3_);
+		g_source_remove (_tmp2_);
 #line 1051 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
-#line 7101 "LibraryWindow.c"
+#line 7415 "LibraryWindow.c"
 	}
 #line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = clear;
-#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp4_) {
-#line 7107 "LibraryWindow.c"
-		gint _tmp5_;
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = priority;
+	if (clear) {
 #line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_clear_background_progress_bar (self, _tmp5_);
-#line 7113 "LibraryWindow.c"
+		library_window_clear_background_progress_bar (self, priority);
+#line 7421 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_update_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority, gdouble count, gdouble total) {
+static void
+library_window_update_background_progress_bar (LibraryWindow* self,
+                                               const gchar* label,
+                                               gint priority,
+                                               gdouble count,
+                                               gdouble total)
+{
 	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gdouble _tmp5_;
-	gint _tmp10_;
+	gboolean _tmp1_ = FALSE;
+	gboolean _tmp2_ = FALSE;
 	gdouble fraction = 0.0;
-	gdouble _tmp11_;
-	gdouble _tmp12_;
-	GtkProgressBar* _tmp13_;
-	gdouble _tmp14_;
-	GtkProgressBar* _tmp15_;
-	const gchar* _tmp16_;
-	gdouble _tmp17_;
-	gchar* _tmp18_;
-	gchar* _tmp19_;
+	GtkProgressBar* _tmp3_;
+	gdouble _tmp4_;
+	GtkProgressBar* _tmp5_;
+	gdouble _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
 #line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = priority;
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = self->priv->current_progress_priority;
+	_tmp0_ = self->priv->current_progress_priority;
 #line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp0_ < _tmp1_) {
+	if (priority < _tmp0_) {
 #line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7148 "LibraryWindow.c"
+#line 7453 "LibraryWindow.c"
 	}
 #line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = priority;
-#line 1063 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = count;
+	library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
 #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp5_ <= 0.0) {
+	if (count <= 0.0) {
 #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = TRUE;
-#line 7160 "LibraryWindow.c"
+		_tmp2_ = TRUE;
+#line 7461 "LibraryWindow.c"
 	} else {
-		gdouble _tmp6_;
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = total;
 #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = _tmp6_ <= 0.0;
-#line 7167 "LibraryWindow.c"
+		_tmp2_ = total <= 0.0;
+#line 7465 "LibraryWindow.c"
 	}
 #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp4_) {
+	if (_tmp2_) {
 #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = TRUE;
-#line 7173 "LibraryWindow.c"
+		_tmp1_ = TRUE;
+#line 7471 "LibraryWindow.c"
 	} else {
-		gdouble _tmp7_;
-		gdouble _tmp8_;
 #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = count;
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = total;
-#line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = _tmp7_ >= _tmp8_;
-#line 7183 "LibraryWindow.c"
+		_tmp1_ = count >= total;
+#line 7475 "LibraryWindow.c"
 	}
 #line 1065 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_) {
-#line 7187 "LibraryWindow.c"
-		gint _tmp9_;
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = priority;
+	if (_tmp1_) {
 #line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_clear_background_progress_bar (self, _tmp9_);
+		library_window_clear_background_progress_bar (self, priority);
 #line 1068 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7195 "LibraryWindow.c"
+#line 7483 "LibraryWindow.c"
 	}
 #line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = priority;
-#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->current_progress_priority = _tmp10_;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = count;
+	self->priv->current_progress_priority = priority;
 #line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = total;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	fraction = _tmp11_ / _tmp12_;
+	fraction = count / total;
 #line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = self->priv->background_progress_bar;
+	_tmp3_ = self->priv->background_progress_bar;
 #line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = fraction;
+	_tmp4_ = fraction;
 #line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_fraction (_tmp13_, _tmp14_);
-#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = self->priv->background_progress_bar;
+	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
 #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = label;
+	_tmp5_ = self->priv->background_progress_bar;
 #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = fraction;
+	_tmp6_ = fraction;
 #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = g_strdup_printf (_ ("%s (%d%%)"), _tmp16_, (gint) (_tmp17_ * 100.0));
+	_tmp7_ = g_strdup_printf (_ ("%s (%d%%)"), label, (gint) (_tmp6_ * 100.0));
 #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = _tmp18_;
+	_tmp8_ = _tmp7_;
 #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_text (_tmp15_, _tmp19_);
+	gtk_progress_bar_set_text (_tmp5_, _tmp8_);
 #line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (_tmp19_);
+	_g_free0 (_tmp8_);
 #line 1076 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 7229 "LibraryWindow.c"
+#line 7509 "LibraryWindow.c"
 }
 
 
-static void library_window_clear_background_progress_bar (LibraryWindow* self, gint priority) {
+static void
+library_window_clear_background_progress_bar (LibraryWindow* self,
+                                              gint priority)
+{
 	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	GtkProgressBar* _tmp3_;
-	GtkProgressBar* _tmp4_;
+	GtkProgressBar* _tmp1_;
+	GtkProgressBar* _tmp2_;
 #line 1085 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = priority;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = self->priv->current_progress_priority;
+	_tmp0_ = self->priv->current_progress_priority;
 #line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp0_ < _tmp1_) {
+	if (priority < _tmp0_) {
 #line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7249 "LibraryWindow.c"
+#line 7528 "LibraryWindow.c"
 	}
 #line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = priority;
-#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
+	library_window_stop_pulse_background_progress_bar (self, priority, FALSE);
 #line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
 #line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = self->priv->background_progress_bar;
+	_tmp1_ = self->priv->background_progress_bar;
 #line 1093 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_fraction (_tmp3_, 0.0);
+	gtk_progress_bar_set_fraction (_tmp1_, 0.0);
 #line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = self->priv->background_progress_bar;
+	_tmp2_ = self->priv->background_progress_bar;
 #line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_text (_tmp4_, "");
+	gtk_progress_bar_set_text (_tmp2_, "");
 #line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
-#line 7267 "LibraryWindow.c"
+#line 7544 "LibraryWindow.c"
 }
 
 
-static void library_window_show_background_progress_bar (LibraryWindow* self) {
+static void
+library_window_show_background_progress_bar (LibraryWindow* self)
+{
 	gboolean _tmp0_;
 #line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -7276,7 +7555,7 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) {
 	_tmp0_ = self->priv->background_progress_displayed;
 #line 1104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 7279 "LibraryWindow.c"
+#line 7558 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
 		GtkFrame* _tmp3_;
@@ -7292,12 +7571,14 @@ static void library_window_show_background_progress_bar (LibraryWindow* self) {
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
-#line 7295 "LibraryWindow.c"
+#line 7574 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_hide_background_progress_bar (LibraryWindow* self) {
+static void
+library_window_hide_background_progress_bar (LibraryWindow* self)
+{
 	gboolean _tmp0_;
 #line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -7305,7 +7586,7 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 	_tmp0_ = self->priv->background_progress_displayed;
 #line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 7308 "LibraryWindow.c"
+#line 7589 "LibraryWindow.c"
 		GtkBox* _tmp1_;
 		GtkFrame* _tmp2_;
 #line 1113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7316,104 +7597,101 @@ static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
-#line 7319 "LibraryWindow.c"
+#line 7600 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
+static void
+library_window_on_library_monitor_discovery_started (LibraryWindow* self)
+{
 #line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 7329 "LibraryWindow.c"
+#line 7612 "LibraryWindow.c"
 }
 
 
-static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) {
+static void
+library_window_on_library_monitor_discovery_completed (LibraryWindow* self)
+{
 #line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 7338 "LibraryWindow.c"
+#line 7623 "LibraryWindow.c"
 }
 
 
-static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
-	gint _tmp0_;
+static void
+library_window_on_library_monitor_auto_update_progress (LibraryWindow* self,
+                                                        gint completed_files,
+                                                        gint total_files)
+{
 #line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = total_files;
-#line 1127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
+	if (total_files < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
 #line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 7352 "LibraryWindow.c"
+#line 7638 "LibraryWindow.c"
 	} else {
-		gint _tmp1_;
-		gint _tmp2_;
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = completed_files;
 #line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = total_files;
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7362 "LibraryWindow.c"
+		library_window_update_background_progress_bar (self, _ ("Updating library…"), LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) completed_files, (gdouble) total_files);
+#line 7642 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
+static void
+library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self)
+{
 #line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _ ("Preparing to auto-import photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 7372 "LibraryWindow.c"
+#line 7654 "LibraryWindow.c"
 }
 
 
-static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes) {
-	guint64 _tmp0_;
-	guint64 _tmp1_;
+static void
+library_window_on_library_monitor_auto_import_progress (LibraryWindow* self,
+                                                        guint64 completed_bytes,
+                                                        guint64 total_bytes)
+{
 #line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = completed_bytes;
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = total_bytes;
-#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 7387 "LibraryWindow.c"
+	library_window_update_background_progress_bar (self, _ ("Auto-importing photos…"), LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) completed_bytes, (gdouble) total_bytes);
+#line 7667 "LibraryWindow.c"
 }
 
 
-static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
-	guint _tmp0_;
+static void
+library_window_on_metadata_writer_progress (LibraryWindow* self,
+                                            guint completed,
+                                            guint total)
+{
 #line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = total;
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
+	if (total < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
 #line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 7401 "LibraryWindow.c"
+#line 7682 "LibraryWindow.c"
 	} else {
-		guint _tmp1_;
-		guint _tmp2_;
-#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = completed;
-#line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = total;
 #line 1149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 7411 "LibraryWindow.c"
+		library_window_update_background_progress_bar (self, _ ("Writing metadata to files…"), LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) completed, (gdouble) total);
+#line 7686 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_create_layout (LibraryWindow* self, Page* start_page) {
+static void
+library_window_create_layout (LibraryWindow* self,
+                              Page* start_page)
+{
 	GtkScrolledWindow* scrolled_sidebar = NULL;
 	GtkScrolledWindow* _tmp0_;
 	SidebarTree* _tmp1_;
@@ -7456,15 +7734,12 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 	GtkPaned* _tmp38_;
 	ConfigFacade* _tmp39_;
 	ConfigFacade* _tmp40_;
-	gint _tmp41_;
-	GtkStack* _tmp42_;
+	GtkStack* _tmp41_;
+	gint _tmp42_;
 	gint _tmp43_;
-	gint _tmp44_;
-	GtkBox* _tmp45_;
-	GtkPaned* _tmp46_;
-	GtkBox* _tmp47_;
-	Page* _tmp48_;
-	Page* _tmp49_;
+	GtkBox* _tmp44_;
+	GtkPaned* _tmp45_;
+	GtkBox* _tmp46_;
 #line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7618,111 +7893,95 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 #line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = _tmp39_;
 #line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp41_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_set_position (_tmp38_, _tmp41_);
+	gtk_paned_set_position (_tmp38_, configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp40_);
 #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_ = self->priv->stack;
+	_tmp41_ = self->priv->stack;
 #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp43_ = library_window_get_PAGE_MIN_WIDTH ();
+	_tmp42_ = library_window_get_PAGE_MIN_WIDTH ();
 #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44_ = _tmp43_;
+	_tmp43_ = _tmp42_;
 #line 1197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), _tmp44_, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp43_, -1);
 #line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp45_ = self->priv->layout;
+	_tmp44_ = self->priv->layout;
 #line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_ = self->priv->client_paned;
+	_tmp45_ = self->priv->client_paned;
 #line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_end (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_end (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp47_ = self->priv->layout;
+	_tmp46_ = self->priv->layout;
 #line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
 #line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp48_ = start_page;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, _tmp48_);
-#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp49_ = start_page;
+	library_window_switch_to_page (self, start_page);
 #line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (start_page, gtk_widget_get_type (), GtkWidget));
 #line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
-#line 7654 "LibraryWindow.c"
+#line 7923 "LibraryWindow.c"
 }
 
 
-static void library_window_real_set_current_page (PageWindow* base, Page* page) {
+static void
+library_window_real_set_current_page (PageWindow* base,
+                                      Page* page)
+{
 	LibraryWindow * self;
-	Page* _tmp0_;
 #line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
-#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, _tmp0_);
-#line 7669 "LibraryWindow.c"
+	library_window_switch_to_page (self, page);
+#line 7938 "LibraryWindow.c"
 }
 
 
-void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
-	gboolean _tmp0_;
+void
+library_window_set_page_switching_enabled (LibraryWindow* self,
+                                           gboolean should_enable)
+{
 #line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = should_enable;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->page_switching_enabled = _tmp0_;
-#line 7681 "LibraryWindow.c"
+	self->priv->page_switching_enabled = should_enable;
+#line 7950 "LibraryWindow.c"
 }
 
 
-void library_window_switch_to_page (LibraryWindow* self, Page* page) {
+void
+library_window_switch_to_page (LibraryWindow* self,
+                               Page* page)
+{
 	gboolean _tmp0_;
 	Page* _tmp1_;
 	Page* _tmp2_;
-	Page* _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp3_;
 	Page* current_page = NULL;
+	Page* _tmp4_;
 	Page* _tmp5_;
-	Page* _tmp6_;
-	GtkStack* _tmp16_;
-	Page* _tmp17_;
-	Page* _tmp18_;
-	Page* _tmp19_;
-	gboolean _tmp21_;
-	Page* _tmp22_;
+	GtkStack* _tmp15_;
 	SidebarEntry* entry = NULL;
-	GeeHashMap* _tmp23_;
-	Page* _tmp24_;
-	gpointer _tmp25_;
-	SidebarEntry* _tmp26_;
-	Page* _tmp37_;
-	Page* _tmp39_;
-	Page* _tmp40_;
-	Page* _tmp41_;
-	Page* _tmp42_;
-	Page* _tmp43_;
-	GMenuModel* _tmp44_;
-	GMenuModel* _tmp45_;
+	GeeHashMap* _tmp17_;
+	gpointer _tmp18_;
+	SidebarEntry* _tmp19_;
+	Page* _tmp29_;
+	Page* _tmp30_;
+	GMenuModel* _tmp31_;
+	GMenuModel* _tmp32_;
 	gboolean old = FALSE;
-	GtkSettings* _tmp46_;
-	gboolean _tmp47_;
-	gboolean _tmp48_;
-	GtkSettings* _tmp49_;
-	gboolean _tmp50_;
-	GtkSettings* _tmp51_;
-	gboolean _tmp52_;
+	GtkSettings* _tmp33_;
+	gboolean _tmp34_;
+	gboolean _tmp35_;
+	GtkSettings* _tmp36_;
+	gboolean _tmp37_;
+	GtkSettings* _tmp38_;
+	gboolean _tmp39_;
 	GtkToolbar* toolbar = NULL;
-	Page* _tmp53_;
-	GtkToolbar* _tmp54_;
-	GtkToolbar* _tmp55_;
-	Page* _tmp61_;
+	GtkToolbar* _tmp40_;
+	GtkToolbar* _tmp41_;
 #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7733,306 +7992,270 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	if (!_tmp0_) {
 #line 1218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7736 "LibraryWindow.c"
+#line 7995 "LibraryWindow.c"
 	}
 #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page;
-#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = _tmp1_ == _tmp3_;
+	_tmp3_ = page == _tmp2_;
 #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp4_) {
+	if (_tmp3_) {
 #line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7752 "LibraryWindow.c"
+#line 8009 "LibraryWindow.c"
 	}
 #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp5_;
+	current_page = _tmp4_;
 #line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = current_page;
+	_tmp5_ = current_page;
 #line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp6_ != NULL) {
-#line 7762 "LibraryWindow.c"
+	if (_tmp5_ != NULL) {
+#line 8019 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
-		Page* _tmp7_;
+		Page* _tmp6_;
+		GtkToolbar* _tmp7_;
 		GtkToolbar* _tmp8_;
-		GtkToolbar* _tmp9_;
+		Page* _tmp11_;
 		Page* _tmp12_;
-		Page* _tmp13_;
-		Page* _tmp15_;
+		Page* _tmp14_;
 #line 1225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
 #line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		application_set_menubar (NULL);
 #line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = current_page;
+		_tmp6_ = current_page;
 #line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = page_get_toolbar (_tmp7_);
+		_tmp7_ = page_get_toolbar (_tmp6_);
 #line 1228 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		toolbar = _tmp8_;
+		toolbar = _tmp7_;
 #line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = toolbar;
+		_tmp8_ = toolbar;
 #line 1229 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp9_ != NULL) {
-#line 7784 "LibraryWindow.c"
-			GtkRevealer* _tmp10_;
-			GtkToolbar* _tmp11_;
+		if (_tmp8_ != NULL) {
+#line 8041 "LibraryWindow.c"
+			GtkRevealer* _tmp9_;
+			GtkToolbar* _tmp10_;
 #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp10_ = self->priv->toolbar_revealer;
+			_tmp9_ = self->priv->toolbar_revealer;
 #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp11_ = toolbar;
+			_tmp10_ = toolbar;
 #line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 7793 "LibraryWindow.c"
+			gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+#line 8050 "LibraryWindow.c"
 		}
 #line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = current_page;
+		_tmp11_ = current_page;
 #line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		page_switching_from (_tmp12_);
+		page_switching_from (_tmp11_);
 #line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = current_page;
+		_tmp12_ = current_page;
 #line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7803 "LibraryWindow.c"
-			SidebarTree* _tmp14_;
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO_PAGE)) {
+#line 8060 "LibraryWindow.c"
+			SidebarTree* _tmp13_;
 #line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp14_ = self->priv->sidebar_tree;
+			_tmp13_ = self->priv->sidebar_tree;
 #line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			sidebar_tree_enable_editing (_tmp14_);
-#line 7809 "LibraryWindow.c"
+			sidebar_tree_enable_editing (_tmp13_);
+#line 8066 "LibraryWindow.c"
 		}
 #line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = current_page;
+		_tmp14_ = current_page;
 #line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_unsubscribe_from_basic_information (self, _tmp15_);
+		library_window_unsubscribe_from_basic_information (self, _tmp14_);
 #line 1224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
-#line 7817 "LibraryWindow.c"
+#line 8074 "LibraryWindow.c"
 	}
 #line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = self->priv->stack;
-#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = page;
+	_tmp15_ = self->priv->stack;
 #line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
+	gtk_stack_set_visible_child (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
 #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = page;
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_);
-#line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = page;
+	PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), page);
 #line 1253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 7833 "LibraryWindow.c"
-		SidebarTree* _tmp20_;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_LIBRARY_PHOTO_PAGE)) {
+#line 8084 "LibraryWindow.c"
+		SidebarTree* _tmp16_;
 #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp20_ = self->priv->sidebar_tree;
+		_tmp16_ = self->priv->sidebar_tree;
 #line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		sidebar_tree_disable_editing (_tmp20_);
-#line 7839 "LibraryWindow.c"
+		sidebar_tree_disable_editing (_tmp16_);
+#line 8090 "LibraryWindow.c"
 	}
 #line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = library_window_should_show_search_bar (self);
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = page;
-#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL);
+	library_window_toggle_search_bar (self, library_window_should_show_search_bar (self), G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) page) : NULL);
 #line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = self->priv->page_map;
+	_tmp17_ = self->priv->page_map;
 #line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = page;
+	_tmp18_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page);
 #line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_);
-#line 1260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	entry = (SidebarEntry*) _tmp25_;
+	entry = (SidebarEntry*) _tmp18_;
 #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_ = entry;
+	_tmp19_ = entry;
 #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp26_ != NULL) {
-#line 7859 "LibraryWindow.c"
+	if (_tmp19_ != NULL) {
+#line 8104 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
-		SidebarEntry* _tmp27_;
-		SidebarExpandableEntry* _tmp28_;
-		gboolean _tmp29_ = FALSE;
-		SidebarExpandableEntry* _tmp30_;
-		SidebarTree* _tmp35_;
-		SidebarEntry* _tmp36_;
+		SidebarEntry* _tmp20_;
+		SidebarExpandableEntry* _tmp21_;
+		gboolean _tmp22_ = FALSE;
+		SidebarExpandableEntry* _tmp23_;
+		SidebarTree* _tmp27_;
+		SidebarEntry* _tmp28_;
 #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp27_ = entry;
+		_tmp20_ = entry;
 #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL);
+		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp20_) : NULL);
 #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		expandable_entry = _tmp28_;
-#line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp30_ = expandable_entry;
+		expandable_entry = _tmp21_;
 #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp30_ != NULL) {
-#line 7877 "LibraryWindow.c"
-			SidebarExpandableEntry* _tmp31_;
-			gboolean _tmp32_;
+		_tmp23_ = expandable_entry;
 #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp31_ = expandable_entry;
+		if (_tmp23_ != NULL) {
+#line 8122 "LibraryWindow.c"
+			SidebarExpandableEntry* _tmp24_;
 #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
+			_tmp24_ = expandable_entry;
 #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp29_ = _tmp32_;
-#line 7886 "LibraryWindow.c"
+			_tmp22_ = sidebar_expandable_entry_expand_on_select (_tmp24_);
+#line 8128 "LibraryWindow.c"
 		} else {
 #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp29_ = FALSE;
-#line 7890 "LibraryWindow.c"
+			_tmp22_ = FALSE;
+#line 8132 "LibraryWindow.c"
 		}
 #line 1265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp29_) {
-#line 7894 "LibraryWindow.c"
-			SidebarTree* _tmp33_;
-			SidebarEntry* _tmp34_;
+		if (_tmp22_) {
+#line 8136 "LibraryWindow.c"
+			SidebarTree* _tmp25_;
+			SidebarEntry* _tmp26_;
 #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp33_ = self->priv->sidebar_tree;
+			_tmp25_ = self->priv->sidebar_tree;
 #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp34_ = entry;
+			_tmp26_ = entry;
 #line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 7903 "LibraryWindow.c"
+			sidebar_tree_expand_to_entry (_tmp25_, _tmp26_);
+#line 8145 "LibraryWindow.c"
 		}
 #line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp35_ = self->priv->sidebar_tree;
+		_tmp27_ = self->priv->sidebar_tree;
 #line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp36_ = entry;
+		_tmp28_ = entry;
 #line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
+		sidebar_tree_place_cursor (_tmp27_, _tmp28_, TRUE);
 #line 1261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
-#line 7913 "LibraryWindow.c"
+#line 8155 "LibraryWindow.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
 #line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp37_ = page;
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 7921 "LibraryWindow.c"
-		Page* _tmp38_;
-#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp38_ = page;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (page, TYPE_CHECKERBOARD_PAGE)) {
 #line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 7927 "LibraryWindow.c"
+		library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
+#line 8163 "LibraryWindow.c"
 	}
 #line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp39_ = page;
-#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (page, gtk_widget_get_type (), GtkWidget));
 #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp29_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp41_ = _tmp40_;
+	_tmp30_ = _tmp29_;
 #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_subscribe_for_basic_information (self, _tmp41_);
+	library_window_subscribe_for_basic_information (self, _tmp30_);
 #line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp41_);
-#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_ = page;
+	_g_object_unref0 (_tmp30_);
 #line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page_switched_to (_tmp42_);
+	page_switched_to (page);
 #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp43_ = page;
+	_tmp31_ = page_get_menubar (page);
 #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44_ = page_get_menubar (_tmp43_);
-#line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp45_ = _tmp44_;
+	_tmp32_ = _tmp31_;
 #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	application_set_menubar (_tmp45_);
+	application_set_menubar (_tmp32_);
 #line 1283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp45_);
+	_g_object_unref0 (_tmp32_);
 #line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
 #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+	_tmp33_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_get (_tmp46_, "gtk-shell-shows-menubar", &_tmp47_, NULL);
+	g_object_get (_tmp33_, "gtk-shell-shows-menubar", &_tmp34_, NULL);
 #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp48_ = _tmp47_;
+	_tmp35_ = _tmp34_;
 #line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	old = _tmp48_;
+	old = _tmp35_;
 #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp49_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+	_tmp36_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_ = old;
+	_tmp37_ = old;
 #line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_set (_tmp49_, "gtk-shell-shows-menubar", !_tmp50_, NULL);
+	g_object_set (_tmp36_, "gtk-shell-shows-menubar", !_tmp37_, NULL);
 #line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp51_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+	_tmp38_ = gtk_widget_get_settings (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp52_ = old;
+	_tmp39_ = old;
 #line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_set (_tmp51_, "gtk-shell-shows-menubar", _tmp52_, NULL);
+	g_object_set (_tmp38_, "gtk-shell-shows-menubar", _tmp39_, NULL);
 #line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp53_ = page;
+	_tmp40_ = page_get_toolbar (page);
 #line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_ = page_get_toolbar (_tmp53_);
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar = _tmp54_;
+	toolbar = _tmp40_;
 #line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp55_ = toolbar;
+	_tmp41_ = toolbar;
 #line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp55_ != NULL) {
-#line 7987 "LibraryWindow.c"
-		GtkRevealer* _tmp56_;
-		GtkToolbar* _tmp57_;
-		GtkToolbar* _tmp58_;
-		GtkRevealer* _tmp59_;
-		gboolean _tmp60_;
+	if (_tmp41_ != NULL) {
+#line 8215 "LibraryWindow.c"
+		GtkRevealer* _tmp42_;
+		GtkToolbar* _tmp43_;
+		GtkToolbar* _tmp44_;
+		GtkRevealer* _tmp45_;
 #line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp56_ = self->priv->toolbar_revealer;
+		_tmp42_ = self->priv->toolbar_revealer;
 #line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp57_ = toolbar;
+		_tmp43_ = toolbar;
 #line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
 #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp58_ = toolbar;
+		_tmp44_ = toolbar;
 #line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
-#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp59_ = self->priv->toolbar_revealer;
+		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget));
 #line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp60_ = library_window_is_toolbar_visible (self);
+		_tmp45_ = self->priv->toolbar_revealer;
 #line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_revealer_set_reveal_child (_tmp59_, _tmp60_);
-#line 8009 "LibraryWindow.c"
+		gtk_revealer_set_reveal_child (_tmp45_, library_window_is_toolbar_visible (self));
+#line 8234 "LibraryWindow.c"
 	}
 #line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp61_ = page;
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page_ready (_tmp61_);
+	page_ready (page);
 #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
 #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
 #line 1216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 8021 "LibraryWindow.c"
+#line 8244 "LibraryWindow.c"
 }
 
 
-static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page) {
+static void
+library_window_init_view_filter (LibraryWindow* self,
+                                 CheckerboardPage* page)
+{
 	SearchFilterToolbar* _tmp0_;
-	CheckerboardPage* _tmp1_;
+	SearchViewFilter* _tmp1_;
 	SearchViewFilter* _tmp2_;
-	SearchViewFilter* _tmp3_;
-	CheckerboardPage* _tmp4_;
-	ViewCollection* _tmp5_;
-	ViewCollection* _tmp6_;
-	CheckerboardPage* _tmp7_;
-	SearchViewFilter* _tmp8_;
-	SearchViewFilter* _tmp9_;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	SearchViewFilter* _tmp5_;
+	SearchViewFilter* _tmp6_;
 #line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8040,38 +8263,34 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
 #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page;
+	_tmp1_ = checkerboard_page_get_search_view_filter (page);
 #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_);
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_);
+	search_filter_toolbar_set_view_filter (_tmp0_, _tmp2_);
 #line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_view_filter_unref0 (_tmp3_);
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = page;
+	_view_filter_unref0 (_tmp2_);
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = _tmp5_;
-#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = page;
+	_tmp4_ = _tmp3_;
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_);
+	_tmp5_ = checkerboard_page_get_search_view_filter (page);
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = _tmp5_;
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
+	view_collection_install_view_filter (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIEW_FILTER, ViewFilter));
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_view_filter_unref0 (_tmp9_);
+	_view_filter_unref0 (_tmp6_);
 #line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_data_collection_unref0 (_tmp6_);
-#line 8070 "LibraryWindow.c"
+	_data_collection_unref0 (_tmp4_);
+#line 8287 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
+static gboolean
+library_window_should_show_search_bar (LibraryWindow* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	Page* _tmp1_;
@@ -8089,30 +8308,32 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	_g_object_unref0 (_tmp2_);
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8092 "LibraryWindow.c"
+#line 8311 "LibraryWindow.c"
 		gboolean _tmp4_;
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 8098 "LibraryWindow.c"
+#line 8317 "LibraryWindow.c"
 	} else {
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 8102 "LibraryWindow.c"
+#line 8321 "LibraryWindow.c"
 	}
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
 #line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8108 "LibraryWindow.c"
+#line 8327 "LibraryWindow.c"
 }
 
 
-static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page) {
+static void
+library_window_toggle_search_bar (LibraryWindow* self,
+                                  gboolean show,
+                                  CheckerboardPage* page)
+{
 	SearchFilterToolbar* _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
 #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8120,102 +8341,79 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
 #line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = show;
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_);
+	gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), show);
 #line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = show;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_) {
-#line 8130 "LibraryWindow.c"
-		CheckerboardPage* _tmp3_;
-		SearchFilterToolbar* _tmp4_;
-		CheckerboardPage* _tmp5_;
+	if (show) {
+#line 8347 "LibraryWindow.c"
+		SearchFilterToolbar* _tmp1_;
+		SearchViewFilter* _tmp2_;
+		SearchViewFilter* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
 		SearchViewFilter* _tmp6_;
 		SearchViewFilter* _tmp7_;
-		CheckerboardPage* _tmp8_;
-		ViewCollection* _tmp9_;
-		ViewCollection* _tmp10_;
-		CheckerboardPage* _tmp11_;
-		SearchViewFilter* _tmp12_;
-		SearchViewFilter* _tmp13_;
-#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = page;
 #line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_vala_assert (NULL != _tmp3_, "null != page");
+		_vala_assert (NULL != page, "null != page");
 #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = self->priv->search_toolbar;
+		_tmp1_ = self->priv->search_toolbar;
 #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = page;
+		_tmp2_ = checkerboard_page_get_search_view_filter (page);
 #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_);
-#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = _tmp6_;
+		_tmp3_ = _tmp2_;
 #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_);
+		search_filter_toolbar_set_view_filter (_tmp1_, _tmp3_);
 #line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_view_filter_unref0 (_tmp7_);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = page;
+		_view_filter_unref0 (_tmp3_);
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = _tmp9_;
+		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = page;
+		_tmp5_ = _tmp4_;
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_);
+		_tmp6_ = checkerboard_page_get_search_view_filter (page);
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp13_ = _tmp12_;
+		_tmp7_ = _tmp6_;
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter));
+		view_collection_install_view_filter (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter));
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_view_filter_unref0 (_tmp13_);
+		_view_filter_unref0 (_tmp7_);
 #line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_data_collection_unref0 (_tmp10_);
-#line 8176 "LibraryWindow.c"
+		_data_collection_unref0 (_tmp5_);
+#line 8381 "LibraryWindow.c"
 	} else {
-		CheckerboardPage* _tmp14_;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = page;
 #line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (_tmp14_ != NULL) {
-#line 8183 "LibraryWindow.c"
-			CheckerboardPage* _tmp15_;
-			ViewCollection* _tmp16_;
-			ViewCollection* _tmp17_;
-			DisabledViewFilter* _tmp18_;
-			DisabledViewFilter* _tmp19_;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp15_ = page;
+		if (page != NULL) {
+#line 8385 "LibraryWindow.c"
+			ViewCollection* _tmp8_;
+			ViewCollection* _tmp9_;
+			DisabledViewFilter* _tmp10_;
+			DisabledViewFilter* _tmp11_;
 #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page));
+			_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (page, TYPE_PAGE, Page));
 #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp17_ = _tmp16_;
+			_tmp9_ = _tmp8_;
 #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp18_ = disabled_view_filter_new ();
+			_tmp10_ = disabled_view_filter_new ();
 #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp19_ = _tmp18_;
+			_tmp11_ = _tmp10_;
 #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter));
+			view_collection_install_view_filter (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIEW_FILTER, ViewFilter));
 #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_view_filter_unref0 (_tmp19_);
+			_view_filter_unref0 (_tmp11_);
 #line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_data_collection_unref0 (_tmp17_);
-#line 8205 "LibraryWindow.c"
+			_data_collection_unref0 (_tmp9_);
+#line 8404 "LibraryWindow.c"
 		}
 	}
 }
 
 
-static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) {
+static void
+library_window_on_page_created (LibraryWindow* self,
+                                SidebarPageRepresentative* entry,
+                                Page* page)
+{
 	GeeHashMap* _tmp0_;
-	Page* _tmp1_;
-	gboolean _tmp2_;
-	GeeHashMap* _tmp3_;
-	Page* _tmp4_;
-	SidebarPageRepresentative* _tmp5_;
-	Page* _tmp6_;
+	GeeHashMap* _tmp1_;
 #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8225,37 +8423,28 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
 #line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_map;
 #line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (!_tmp2_, "!page_map.has_key(page)");
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = self->priv->page_map;
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page), "!page_map.has_key(page)");
 #line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = page;
+	_tmp1_ = self->priv->page_map;
 #line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = entry;
-#line 1323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = page;
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_add_to_stack (self, _tmp6_);
-#line 8245 "LibraryWindow.c"
+	library_window_add_to_stack (self, page);
+#line 8433 "LibraryWindow.c"
 }
 
 
-static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageRepresentative* entry, Page* page) {
+static void
+library_window_on_destroying_page (LibraryWindow* self,
+                                   SidebarPageRepresentative* entry,
+                                   Page* page)
+{
 	Page* _tmp0_;
 	Page* _tmp1_;
-	Page* _tmp2_;
-	gboolean _tmp3_;
-	Page* _tmp9_;
+	gboolean _tmp2_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp10_;
-	Page* _tmp11_;
-	gboolean _tmp12_;
+	GeeHashMap* _tmp8_;
+	gboolean _tmp9_;
 #line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8263,115 +8452,109 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 #line 1328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
 #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp0_ == _tmp2_;
+	_tmp2_ = page == _tmp1_;
 #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_) {
-#line 8277 "LibraryWindow.c"
-		LibraryBranch* _tmp4_;
+	if (_tmp2_) {
+#line 8464 "LibraryWindow.c"
+		LibraryBranch* _tmp3_;
+		LibraryPhotosEntry* _tmp4_;
 		LibraryPhotosEntry* _tmp5_;
-		LibraryPhotosEntry* _tmp6_;
+		Page* _tmp6_;
 		Page* _tmp7_;
-		Page* _tmp8_;
 #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = self->priv->library_branch;
+		_tmp3_ = self->priv->library_branch;
 #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = library_branch_get_photos_entry (_tmp4_);
+		_tmp4_ = library_branch_get_photos_entry (_tmp3_);
 #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp6_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp8_);
+		library_window_switch_to_page (self, _tmp7_);
 #line 1331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp8_);
-#line 8297 "LibraryWindow.c"
+		_g_object_unref0 (_tmp7_);
+#line 8484 "LibraryWindow.c"
 	}
 #line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = page;
-#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_remove_from_stack (self, _tmp9_);
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = self->priv->page_map;
+	library_window_remove_from_stack (self, page);
 #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = page;
+	_tmp8_ = self->priv->page_map;
 #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
+	_tmp9_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), page, NULL);
 #line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	removed = _tmp12_;
+	removed = _tmp9_;
 #line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
-#line 8313 "LibraryWindow.c"
+#line 8496 "LibraryWindow.c"
 }
 
 
-static void library_window_on_sidebar_entry_selected (LibraryWindow* self, SidebarSelectableEntry* selectable) {
+static void
+library_window_on_sidebar_entry_selected (LibraryWindow* self,
+                                          SidebarSelectableEntry* selectable)
+{
 	SidebarPageRepresentative* page_rep = NULL;
-	SidebarSelectableEntry* _tmp0_;
+	SidebarPageRepresentative* _tmp0_;
 	SidebarPageRepresentative* _tmp1_;
-	SidebarPageRepresentative* _tmp2_;
 #line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
 #line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = selectable;
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (selectable, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) selectable) : NULL);
 #line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL);
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page_rep = _tmp1_;
+	page_rep = _tmp0_;
 #line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = page_rep;
+	_tmp1_ = page_rep;
 #line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp2_ != NULL) {
-#line 8336 "LibraryWindow.c"
-		SidebarPageRepresentative* _tmp3_;
+	if (_tmp1_ != NULL) {
+#line 8519 "LibraryWindow.c"
+		SidebarPageRepresentative* _tmp2_;
+		Page* _tmp3_;
 		Page* _tmp4_;
-		Page* _tmp5_;
 #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = page_rep;
+		_tmp2_ = page_rep;
 #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = sidebar_page_representative_get_page (_tmp3_);
+		_tmp3_ = sidebar_page_representative_get_page (_tmp2_);
 #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp5_);
+		library_window_switch_to_page (self, _tmp4_);
 #line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp5_);
-#line 8350 "LibraryWindow.c"
+		_g_object_unref0 (_tmp4_);
+#line 8533 "LibraryWindow.c"
 	}
 #line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
-#line 8354 "LibraryWindow.c"
+#line 8537 "LibraryWindow.c"
 }
 
 
-static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* self, SidebarSelectableEntry* selectable) {
+static void
+library_window_on_sidebar_selected_entry_removed (LibraryWindow* self,
+                                                  SidebarSelectableEntry* selectable)
+{
 	LibraryLastImportSidebarEntry* last_import_entry = NULL;
 	LibraryBranch* _tmp0_;
 	LibraryLastImportSidebarEntry* _tmp1_;
 	LibraryLastImportSidebarEntry* _tmp2_;
 	LibraryLastImportSidebarEntry* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	SidebarSelectableEntry* _tmp5_;
-	gboolean _tmp12_ = FALSE;
-	SidebarSelectableEntry* _tmp13_;
-	gboolean _tmp21_ = FALSE;
-	SidebarSelectableEntry* _tmp22_;
-	LibraryBranch* _tmp30_;
-	LibraryPhotosEntry* _tmp31_;
-	LibraryPhotosEntry* _tmp32_;
-	Page* _tmp33_;
-	Page* _tmp34_;
+	gboolean _tmp11_ = FALSE;
+	gboolean _tmp18_ = FALSE;
+	LibraryBranch* _tmp25_;
+	LibraryPhotosEntry* _tmp26_;
+	LibraryPhotosEntry* _tmp27_;
+	Page* _tmp28_;
+	Page* _tmp29_;
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8387,209 +8570,214 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 #line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	last_import_entry = _tmp3_;
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = selectable;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 8393 "LibraryWindow.c"
-		LibraryLastImportSidebarEntry* _tmp6_;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
+#line 8574 "LibraryWindow.c"
+		LibraryLastImportSidebarEntry* _tmp5_;
+		gboolean _tmp6_;
 		gboolean _tmp7_;
-		gboolean _tmp8_;
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = last_import_entry;
+		_tmp5_ = last_import_entry;
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry));
+		_tmp6_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry));
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = _tmp8_;
-#line 8405 "LibraryWindow.c"
+		_tmp4_ = _tmp7_;
+#line 8586 "LibraryWindow.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
-#line 8409 "LibraryWindow.c"
+#line 8590 "LibraryWindow.c"
 	}
 #line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8413 "LibraryWindow.c"
-		LibraryLastImportSidebarEntry* _tmp9_;
+#line 8594 "LibraryWindow.c"
+		LibraryLastImportSidebarEntry* _tmp8_;
+		Page* _tmp9_;
 		Page* _tmp10_;
-		Page* _tmp11_;
 #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = last_import_entry;
+		_tmp8_ = last_import_entry;
 #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp9_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp11_);
+		library_window_switch_to_page (self, _tmp10_);
 #line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp11_);
+		_g_object_unref0 (_tmp10_);
 #line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
 #line 1355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8431 "LibraryWindow.c"
+#line 8612 "LibraryWindow.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = selectable;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 8437 "LibraryWindow.c"
-		EventsBranch* _tmp14_;
-		gboolean _tmp15_;
-#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = self->priv->events_branch;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_EVENT_ENTRY)) {
+#line 8616 "LibraryWindow.c"
+		EventsBranch* _tmp12_;
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+		_tmp12_ = self->priv->events_branch;
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = _tmp15_;
-#line 8446 "LibraryWindow.c"
+		_tmp11_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 8622 "LibraryWindow.c"
 	} else {
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp12_ = FALSE;
-#line 8450 "LibraryWindow.c"
+		_tmp11_ = FALSE;
+#line 8626 "LibraryWindow.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp12_) {
-#line 8454 "LibraryWindow.c"
-		EventsBranch* _tmp16_;
-		EventsMasterDirectoryEntry* _tmp17_;
-		EventsMasterDirectoryEntry* _tmp18_;
-		Page* _tmp19_;
-		Page* _tmp20_;
+	if (_tmp11_) {
+#line 8630 "LibraryWindow.c"
+		EventsBranch* _tmp13_;
+		EventsMasterDirectoryEntry* _tmp14_;
+		EventsMasterDirectoryEntry* _tmp15_;
+		Page* _tmp16_;
+		Page* _tmp17_;
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = self->priv->events_branch;
+		_tmp13_ = self->priv->events_branch;
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = events_branch_get_master_entry (_tmp16_);
+		_tmp14_ = events_branch_get_master_entry (_tmp13_);
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp18_ = _tmp17_;
+		_tmp15_ = _tmp14_;
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp16_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp20_ = _tmp19_;
+		_tmp17_ = _tmp16_;
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp20_);
+		library_window_switch_to_page (self, _tmp17_);
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp20_);
+		_g_object_unref0 (_tmp17_);
 #line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp18_);
+		_g_object_unref0 (_tmp15_);
 #line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
 #line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8480 "LibraryWindow.c"
+#line 8656 "LibraryWindow.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = selectable;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 8486 "LibraryWindow.c"
-		EventsBranch* _tmp23_;
-		gboolean _tmp24_;
-#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp23_ = self->priv->events_branch;
+	if (G_TYPE_CHECK_INSTANCE_TYPE (selectable, EVENTS_TYPE_DIRECTORY_ENTRY)) {
+#line 8660 "LibraryWindow.c"
+		EventsBranch* _tmp19_;
 #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+		_tmp19_ = self->priv->events_branch;
 #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp21_ = _tmp24_;
-#line 8495 "LibraryWindow.c"
+		_tmp18_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
+#line 8666 "LibraryWindow.c"
 	} else {
 #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp21_ = FALSE;
-#line 8499 "LibraryWindow.c"
+		_tmp18_ = FALSE;
+#line 8670 "LibraryWindow.c"
 	}
 #line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp21_) {
-#line 8503 "LibraryWindow.c"
-		EventsBranch* _tmp25_;
-		EventsMasterDirectoryEntry* _tmp26_;
-		EventsMasterDirectoryEntry* _tmp27_;
-		Page* _tmp28_;
-		Page* _tmp29_;
+	if (_tmp18_) {
+#line 8674 "LibraryWindow.c"
+		EventsBranch* _tmp20_;
+		EventsMasterDirectoryEntry* _tmp21_;
+		EventsMasterDirectoryEntry* _tmp22_;
+		Page* _tmp23_;
+		Page* _tmp24_;
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp25_ = self->priv->events_branch;
+		_tmp20_ = self->priv->events_branch;
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp26_ = events_branch_get_master_entry (_tmp25_);
+		_tmp21_ = events_branch_get_master_entry (_tmp20_);
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp27_ = _tmp26_;
+		_tmp22_ = _tmp21_;
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+		_tmp23_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp29_ = _tmp28_;
+		_tmp24_ = _tmp23_;
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_switch_to_page (self, _tmp29_);
+		library_window_switch_to_page (self, _tmp24_);
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp29_);
+		_g_object_unref0 (_tmp24_);
 #line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp27_);
+		_g_object_unref0 (_tmp22_);
 #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
 #line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8529 "LibraryWindow.c"
+#line 8700 "LibraryWindow.c"
 	}
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = self->priv->library_branch;
+	_tmp25_ = self->priv->library_branch;
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = library_branch_get_photos_entry (_tmp30_);
+	_tmp26_ = library_branch_get_photos_entry (_tmp25_);
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = _tmp31_;
+	_tmp27_ = _tmp26_;
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+	_tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = _tmp33_;
+	_tmp29_ = _tmp28_;
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, _tmp34_);
+	library_window_switch_to_page (self, _tmp29_);
 #line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp34_);
+	_g_object_unref0 (_tmp29_);
 #line 1345 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
-#line 8547 "LibraryWindow.c"
+#line 8718 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
+static void
+_library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender,
+                                                                          GeeIterable* changed,
+                                                                          gpointer self)
+{
 #line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8554 "LibraryWindow.c"
+#line 8729 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender,
+                                                                    GeeMap* items,
+                                                                    gpointer self)
+{
 #line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8561 "LibraryWindow.c"
+#line 8740 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
+static void
+_library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender,
+                                                                       GeeIterable* added,
+                                                                       GeeIterable* removed,
+                                                                       gpointer self)
+{
 #line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8568 "LibraryWindow.c"
+#line 8752 "LibraryWindow.c"
 }
 
 
-static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
+static void
+_library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender,
+                                                                               GeeCollection* changed,
+                                                                               gpointer self)
+{
 #line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 8575 "LibraryWindow.c"
+#line 8763 "LibraryWindow.c"
 }
 
 
-static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page) {
+static void
+library_window_subscribe_for_basic_information (LibraryWindow* self,
+                                                Page* page)
+{
 	ViewCollection* view = NULL;
-	Page* _tmp0_;
-	ViewCollection* _tmp1_;
+	ViewCollection* _tmp0_;
 #line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
-#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page_get_view (_tmp0_);
+	_tmp0_ = page_get_view (page);
 #line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = _tmp1_;
+	view = _tmp0_;
 #line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0);
 #line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8600,51 +8788,53 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
 	g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0);
 #line 1376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8603 "LibraryWindow.c"
+#line 8791 "LibraryWindow.c"
 }
 
 
-static void library_window_unsubscribe_from_basic_information (LibraryWindow* self, Page* page) {
+static void
+library_window_unsubscribe_from_basic_information (LibraryWindow* self,
+                                                   Page* page)
+{
 	ViewCollection* view = NULL;
-	Page* _tmp0_;
-	ViewCollection* _tmp1_;
+	ViewCollection* _tmp0_;
+	guint _tmp1_;
 	guint _tmp2_;
 	guint _tmp3_;
 	guint _tmp4_;
-	guint _tmp5_;
 #line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
 #line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page;
+	_tmp0_ = page_get_view (page);
 #line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = page_get_view (_tmp0_);
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = _tmp1_;
+	view = _tmp0_;
 #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
+	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp1_, NULL, FALSE);
 #line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
+	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
 #line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE);
 #line 1389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
 #line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
+	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
 #line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self);
 #line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
+	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp4_, NULL, FALSE);
 #line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
+	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
 #line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 8643 "LibraryWindow.c"
+#line 8831 "LibraryWindow.c"
 }
 
 
-static void library_window_on_update_properties (LibraryWindow* self) {
+static void
+library_window_on_update_properties (LibraryWindow* self)
+{
 	OneShotScheduler* _tmp0_;
 #line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
@@ -8652,11 +8842,13 @@ static void library_window_on_update_properties (LibraryWindow* self) {
 	_tmp0_ = self->priv->properties_scheduler;
 #line 1395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
-#line 8655 "LibraryWindow.c"
+#line 8845 "LibraryWindow.c"
 }
 
 
-static void library_window_on_update_properties_now (LibraryWindow* self) {
+static void
+library_window_on_update_properties_now (LibraryWindow* self)
+{
 	GtkFrame* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
@@ -8673,7 +8865,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	_tmp2_ = _tmp1_;
 #line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 8676 "LibraryWindow.c"
+#line 8868 "LibraryWindow.c"
 		BasicProperties* _tmp3_;
 		Page* _tmp4_;
 		Page* _tmp5_;
@@ -8687,7 +8879,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
 #line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 8690 "LibraryWindow.c"
+#line 8882 "LibraryWindow.c"
 	}
 #line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
@@ -8697,7 +8889,7 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	_tmp8_ = _tmp7_;
 #line 1402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 8700 "LibraryWindow.c"
+#line 8892 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp9_;
 		Page* _tmp10_;
 		Page* _tmp11_;
@@ -8711,263 +8903,237 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
 #line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 8714 "LibraryWindow.c"
+#line 8906 "LibraryWindow.c"
 	}
 }
 
 
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+                const gchar* old,
+                const gchar* replacement)
+{
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 8734 "LibraryWindow.c"
+#line 8930 "LibraryWindow.c"
 	} else {
-		const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 8741 "LibraryWindow.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) old)) == '\0';
+#line 8934 "LibraryWindow.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 8747 "LibraryWindow.c"
+#line 8940 "LibraryWindow.c"
 	} else {
-		const gchar* _tmp3_;
-		const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 8757 "LibraryWindow.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 8944 "LibraryWindow.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8761 "LibraryWindow.c"
-		gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 8948 "LibraryWindow.c"
+		gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 8769 "LibraryWindow.c"
+#line 8956 "LibraryWindow.c"
 	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		GRegex* _tmp9_;
-		GRegex* _tmp10_;
-		gchar* _tmp11_ = NULL;
-		GRegex* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		GRegex* _tmp5_;
+		GRegex* _tmp6_;
+		gchar* _tmp7_ = NULL;
+		GRegex* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8801 "LibraryWindow.c"
+#line 8984 "LibraryWindow.c"
 				goto __catch48_g_regex_error;
 			}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			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);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8810 "LibraryWindow.c"
+#line 8993 "LibraryWindow.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 8826 "LibraryWindow.c"
+#line 9007 "LibraryWindow.c"
 				goto __catch48_g_regex_error;
 			}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			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);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 8837 "LibraryWindow.c"
+#line 9018 "LibraryWindow.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 8851 "LibraryWindow.c"
+#line 9032 "LibraryWindow.c"
 	}
 	goto __finally48;
 	__catch48_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 8865 "LibraryWindow.c"
+#line 9046 "LibraryWindow.c"
 	}
 	__finally48:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return NULL;
-#line 8876 "LibraryWindow.c"
+#line 9057 "LibraryWindow.c"
 	}
 }
 
 
-void library_window_mounted_camera_shell_notification (LibraryWindow* self, const gchar* uri, gboolean at_startup) {
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	gboolean _tmp2_;
+void
+library_window_mounted_camera_shell_notification (LibraryWindow* self,
+                                                  const gchar* uri,
+                                                  gboolean at_startup)
+{
 	GFile* uri_file = NULL;
-	const gchar* _tmp4_;
-	GFile* _tmp5_;
+	GFile* _tmp0_;
 	GMount* mount = NULL;
 	gchar* alt_uri = NULL;
-	const gchar* _tmp12_;
-	gboolean _tmp13_;
-	gboolean _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (uri != NULL);
 #line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = uri;
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:1407: mount point reported: %s", _tmp0_);
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = uri;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
+	g_debug ("LibraryWindow.vala:1407: mount point reported: %s", uri);
 #line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!_tmp2_) {
-#line 8908 "LibraryWindow.c"
-		const gchar* _tmp3_;
+	if (!library_window_is_mount_uri_supported (uri)) {
 #line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp3_ = uri;
-#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", _tmp3_);
+		g_debug ("LibraryWindow.vala:1411: Unsupported mount scheme: %s", uri);
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8916 "LibraryWindow.c"
+#line 9084 "LibraryWindow.c"
 	}
 #line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = uri;
-#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = g_file_new_for_uri (_tmp4_);
+	_tmp0_ = g_file_new_for_uri (uri);
 #line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	uri_file = _tmp5_;
+	uri_file = _tmp0_;
 #line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 8926 "LibraryWindow.c"
+#line 9092 "LibraryWindow.c"
 	{
-		GMount* _tmp6_ = NULL;
-		GFile* _tmp7_;
-		GMount* _tmp8_;
-		GMount* _tmp9_;
+		GMount* _tmp1_ = NULL;
+		GFile* _tmp2_;
+		GMount* _tmp3_;
+		GMount* _tmp4_;
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = uri_file;
+		_tmp2_ = uri_file;
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_);
+		_tmp3_ = g_file_find_enclosing_mount (_tmp2_, NULL, &_inner_error_);
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = _tmp8_;
+		_tmp1_ = _tmp3_;
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8940 "LibraryWindow.c"
+#line 9106 "LibraryWindow.c"
 			goto __catch47_g_error;
 		}
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = _tmp6_;
+		_tmp4_ = _tmp1_;
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = NULL;
+		_tmp1_ = NULL;
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
 #line 1421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		mount = _tmp9_;
+		mount = _tmp4_;
 #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp6_);
-#line 8953 "LibraryWindow.c"
+		_g_object_unref0 (_tmp1_);
+#line 9119 "LibraryWindow.c"
 	}
 	goto __finally47;
 	__catch47_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp10_;
-		const gchar* _tmp11_;
+		GError* _tmp5_;
+		const gchar* _tmp6_;
 #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
 #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
 #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp10_ = err;
+		_tmp5_ = err;
 #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp11_ = _tmp10_->message;
+		_tmp6_ = _tmp5_->message;
 #line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1423: %s", _tmp11_);
+		g_debug ("LibraryWindow.vala:1423: %s", _tmp6_);
 #line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
 #line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8976,7 +9142,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		_g_object_unref0 (uri_file);
 #line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8979 "LibraryWindow.c"
+#line 9145 "LibraryWindow.c"
 	}
 	__finally47:
 #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8991,79 +9157,58 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		g_clear_error (&_inner_error_);
 #line 1420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8994 "LibraryWindow.c"
+#line 9160 "LibraryWindow.c"
 	}
 #line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt_uri = NULL;
 #line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = uri;
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = g_str_has_prefix (_tmp12_, "file://");
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp13_) {
-#line 9004 "LibraryWindow.c"
-		const gchar* _tmp14_;
-		gchar* _tmp15_;
-		gchar* _tmp16_;
-		gchar* _tmp17_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp14_ = uri;
+	if (g_str_has_prefix (uri, "file://")) {
+#line 9166 "LibraryWindow.c"
+		gchar* _tmp7_;
+		gchar* _tmp8_;
+		gchar* _tmp9_;
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = string_replace (_tmp14_, "file://", "disk:");
+		_tmp7_ = string_replace (uri, "file://", "disk:");
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = _tmp15_;
+		_tmp8_ = _tmp7_;
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp17_ = camera_table_get_port_uri (_tmp16_);
+		_tmp9_ = camera_table_get_port_uri (_tmp8_);
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (alt_uri);
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		alt_uri = _tmp17_;
+		alt_uri = _tmp9_;
 #line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_free0 (_tmp16_);
-#line 9023 "LibraryWindow.c"
+		_g_free0 (_tmp8_);
+#line 9182 "LibraryWindow.c"
 	}
 #line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = at_startup;
-#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp18_) {
-#line 9029 "LibraryWindow.c"
-		const gchar* _tmp19_;
-		gboolean _tmp20_;
-		const gchar* _tmp23_;
-		gboolean _tmp24_;
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp19_ = uri;
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp20_ = is_string_empty (_tmp19_);
+	if (at_startup) {
+#line 9186 "LibraryWindow.c"
+		const gchar* _tmp11_;
 #line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (!_tmp20_) {
-#line 9040 "LibraryWindow.c"
-			GeeHashSet* _tmp21_;
-			const gchar* _tmp22_;
+		if (!is_string_empty (uri)) {
+#line 9190 "LibraryWindow.c"
+			GeeHashSet* _tmp10_;
 #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp21_ = library_window_initial_camera_uris;
+			_tmp10_ = library_window_initial_camera_uris;
 #line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp22_ = uri;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 9049 "LibraryWindow.c"
+			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), uri);
+#line 9196 "LibraryWindow.c"
 		}
 #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp23_ = alt_uri;
-#line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp24_ = is_string_empty (_tmp23_);
+		_tmp11_ = alt_uri;
 #line 1438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (!_tmp24_) {
-#line 9057 "LibraryWindow.c"
-			GeeHashSet* _tmp25_;
-			const gchar* _tmp26_;
+		if (!is_string_empty (_tmp11_)) {
+#line 9202 "LibraryWindow.c"
+			GeeHashSet* _tmp12_;
+			const gchar* _tmp13_;
 #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp25_ = library_window_initial_camera_uris;
+			_tmp12_ = library_window_initial_camera_uris;
 #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp26_ = alt_uri;
+			_tmp13_ = alt_uri;
 #line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 9066 "LibraryWindow.c"
+			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
+#line 9211 "LibraryWindow.c"
 		}
 	}
 #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9072,11 +9217,14 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	_g_object_unref0 (mount);
 #line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 9075 "LibraryWindow.c"
+#line 9220 "LibraryWindow.c"
 }
 
 
-static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+library_window_real_key_press_event (GtkWidget* base,
+                                     GdkEventKey* event)
+{
 	LibraryWindow * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
@@ -9084,11 +9232,8 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	SidebarTree* _tmp2_;
 	gboolean _tmp3_;
 	gboolean _tmp4_;
-	GdkEventKey* _tmp11_;
-	gboolean _tmp12_;
-	GdkEventKey* _tmp13_;
-	guint _tmp14_;
-	const gchar* _tmp15_;
+	guint _tmp8_;
+	const gchar* _tmp9_;
 #line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 1443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9101,43 +9246,34 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	_tmp4_ = _tmp3_;
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 9104 "LibraryWindow.c"
+#line 9249 "LibraryWindow.c"
 		SidebarTree* _tmp5_;
-		GdkEventKey* _tmp6_;
-		gboolean _tmp7_;
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = event;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = _tmp7_;
-#line 9116 "LibraryWindow.c"
+		_tmp1_ = sidebar_tree_is_keypress_interpreted (_tmp5_, event);
+#line 9255 "LibraryWindow.c"
 	} else {
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
-#line 9120 "LibraryWindow.c"
+#line 9259 "LibraryWindow.c"
 	}
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
-#line 9124 "LibraryWindow.c"
-		SidebarTree* _tmp8_;
-		GdkEventKey* _tmp9_;
-		gboolean _tmp10_ = FALSE;
+#line 9263 "LibraryWindow.c"
+		SidebarTree* _tmp6_;
+		gboolean _tmp7_ = FALSE;
 #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = self->priv->sidebar_tree;
+		_tmp6_ = self->priv->sidebar_tree;
 #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = event;
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp7_);
 #line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_);
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp0_ = _tmp10_;
-#line 9136 "LibraryWindow.c"
+		_tmp0_ = _tmp7_;
+#line 9272 "LibraryWindow.c"
 	} else {
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 9140 "LibraryWindow.c"
+#line 9276 "LibraryWindow.c"
 	}
 #line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
@@ -9145,45 +9281,41 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 		result = TRUE;
 #line 1446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9148 "LibraryWindow.c"
+#line 9284 "LibraryWindow.c"
 	}
 #line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = event;
-#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp12_) {
+	if (GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), event)) {
 #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
 #line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9160 "LibraryWindow.c"
+#line 9292 "LibraryWindow.c"
 	}
 #line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = event;
+	_tmp8_ = event->keyval;
 #line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = _tmp13_->keyval;
+	_tmp9_ = gdk_keyval_name (_tmp8_);
 #line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = gdk_keyval_name (_tmp14_);
-#line 1452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (g_strcmp0 (_tmp15_, "Escape") == 0) {
+	if (g_strcmp0 (_tmp9_, "Escape") == 0) {
 #line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_clear_search (self);
 #line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
 #line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 9176 "LibraryWindow.c"
+#line 9306 "LibraryWindow.c"
 	}
 #line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
 #line 1457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9182 "LibraryWindow.c"
+#line 9312 "LibraryWindow.c"
 }
 
 
-gint library_window_get_PAGE_MIN_WIDTH (void) {
+gint
+library_window_get_PAGE_MIN_WIDTH (void)
+{
 	gint result;
 	gint _tmp0_;
 	gint _tmp1_;
@@ -9195,25 +9327,29 @@ gint library_window_get_PAGE_MIN_WIDTH (void) {
 	result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2);
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9198 "LibraryWindow.c"
+#line 9330 "LibraryWindow.c"
 }
 
 
-static gpointer _data_collection_ref0 (gpointer self) {
+static gpointer
+_data_collection_ref0 (gpointer self)
+{
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 9205 "LibraryWindow.c"
+#line 9339 "LibraryWindow.c"
 }
 
 
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_construct (GType object_type, CollectionPage* collection, Photo* start, ViewCollection* view) {
+static LibraryWindowFullscreenPhotoPage*
+library_window_fullscreen_photo_page_construct (GType object_type,
+                                                CollectionPage* collection,
+                                                Photo* start,
+                                                ViewCollection* view)
+{
 	LibraryWindowFullscreenPhotoPage * self = NULL;
 	CollectionPage* _tmp0_;
-	CollectionPage* _tmp1_;
-	Photo* _tmp2_;
-	Photo* _tmp3_;
-	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	Photo* _tmp1_;
+	ViewCollection* _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (collection), NULL);
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9223,43 +9359,43 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = (LibraryWindowFullscreenPhotoPage*) library_photo_page_construct (object_type);
 #line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = collection;
-#line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (collection);
 #line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->collection);
 #line 76 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->collection = _tmp1_;
+	self->priv->collection = _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = start;
-#line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (start);
 #line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->start);
 #line 77 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->start = _tmp3_;
-#line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = view;
+	self->priv->start = _tmp1_;
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = _data_collection_ref0 (_tmp4_);
+	_tmp2_ = _data_collection_ref0 (view);
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (self->priv->view);
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->view = _tmp5_;
+	self->priv->view = _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 9251 "LibraryWindow.c"
+#line 9381 "LibraryWindow.c"
 }
 
 
-static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) {
+static LibraryWindowFullscreenPhotoPage*
+library_window_fullscreen_photo_page_new (CollectionPage* collection,
+                                          Photo* start,
+                                          ViewCollection* view)
+{
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view);
-#line 9258 "LibraryWindow.c"
+#line 9392 "LibraryWindow.c"
 }
 
 
-static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
+static void
+library_window_fullscreen_photo_page_real_switched_to (Page* base)
+{
 	LibraryWindowFullscreenPhotoPage * self;
 	CollectionPage* _tmp0_;
 	Photo* _tmp1_;
@@ -9276,34 +9412,38 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
 	library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_);
 #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page));
-#line 9279 "LibraryWindow.c"
+#line 9415 "LibraryWindow.c"
 }
 
 
-static void library_window_fullscreen_photo_page_real_switching_from (Page* base) {
+static void
+library_window_fullscreen_photo_page_real_switching_from (Page* base)
+{
 	LibraryWindowFullscreenPhotoPage * self;
 #line 87 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
-#line 9287 "LibraryWindow.c"
+#line 9425 "LibraryWindow.c"
 }
 
 
-static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+library_window_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base,
+                                                                     GeeList* ui_filenames)
+{
 	LibraryWindowFullscreenPhotoPage * self;
-	GeeList* _tmp0_;
 #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
 #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = ui_filenames;
-#line 93 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 9302 "LibraryWindow.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
+#line 9440 "LibraryWindow.c"
 }
 
 
-static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPageClass * klass) {
+static void
+library_window_fullscreen_photo_page_class_init (LibraryWindowFullscreenPhotoPageClass * klass)
+{
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9316,18 +9456,22 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize;
-#line 9319 "LibraryWindow.c"
+#line 9459 "LibraryWindow.c"
 }
 
 
-static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) {
+static void
+library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self)
+{
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self);
-#line 9326 "LibraryWindow.c"
+#line 9468 "LibraryWindow.c"
 }
 
 
-static void library_window_fullscreen_photo_page_finalize (GObject * obj) {
+static void
+library_window_fullscreen_photo_page_finalize (GObject * obj)
+{
 	LibraryWindowFullscreenPhotoPage * self;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, LibraryWindowFullscreenPhotoPage);
@@ -9339,11 +9483,13 @@ static void library_window_fullscreen_photo_page_finalize (GObject * obj) {
 	_data_collection_unref0 (self->priv->view);
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj);
-#line 9342 "LibraryWindow.c"
+#line 9486 "LibraryWindow.c"
 }
 
 
-static GType library_window_fullscreen_photo_page_get_type (void) {
+static GType
+library_window_fullscreen_photo_page_get_type (void)
+{
 	static volatile gsize library_window_fullscreen_photo_page_type_id__volatile = 0;
 	if (g_once_init_enter (&library_window_fullscreen_photo_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryWindowFullscreenPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_window_fullscreen_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryWindowFullscreenPhotoPage), 0, (GInstanceInitFunc) library_window_fullscreen_photo_page_instance_init, NULL };
@@ -9355,7 +9501,9 @@ static GType library_window_fullscreen_photo_page_get_type (void) {
 }
 
 
-static void library_window_class_init (LibraryWindowClass * klass) {
+static void
+library_window_class_init (LibraryWindowClass * klass)
+{
 	GeeHashSet* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_parent_class = g_type_class_peek_parent (klass);
@@ -9393,11 +9541,13 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
-#line 9396 "LibraryWindow.c"
+#line 9544 "LibraryWindow.c"
 }
 
 
-static void library_window_instance_init (LibraryWindow * self) {
+static void
+library_window_instance_init (LibraryWindow * self)
+{
 	const gchar* _tmp0_;
 	gchar* _tmp1_;
 	GtkPaned* _tmp2_;
@@ -9536,11 +9686,13 @@ static void library_window_instance_init (LibraryWindow * self) {
 	self->priv->current_progress_priority = 0;
 #line 146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
-#line 9539 "LibraryWindow.c"
+#line 9689 "LibraryWindow.c"
 }
 
 
-static void library_window_finalize (GObject * obj) {
+static void
+library_window_finalize (GObject * obj)
+{
 	LibraryWindow * self;
 	SidebarTree* _tmp0_;
 	guint _tmp1_;
@@ -9556,24 +9708,24 @@ static void library_window_finalize (GObject * obj) {
 	guint _tmp11_;
 	ExtendedPropertiesWindow* _tmp12_;
 	guint _tmp13_;
+	MetadataWriter* _tmp27_;
 	MetadataWriter* _tmp28_;
-	MetadataWriter* _tmp29_;
-	guint _tmp30_;
+	guint _tmp29_;
 	LibraryMonitor* monitor = NULL;
+	LibraryMonitorPool* _tmp30_;
 	LibraryMonitorPool* _tmp31_;
-	LibraryMonitorPool* _tmp32_;
+	LibraryMonitor* _tmp32_;
 	LibraryMonitor* _tmp33_;
 	LibraryMonitor* _tmp34_;
-	LibraryMonitor* _tmp35_;
+	LibraryMonitorPool* _tmp36_;
 	LibraryMonitorPool* _tmp37_;
-	LibraryMonitorPool* _tmp38_;
-	guint _tmp39_;
+	guint _tmp38_;
+	LibraryMonitorPool* _tmp39_;
 	LibraryMonitorPool* _tmp40_;
-	LibraryMonitorPool* _tmp41_;
-	guint _tmp42_;
+	guint _tmp41_;
+	CameraTable* _tmp42_;
 	CameraTable* _tmp43_;
-	CameraTable* _tmp44_;
-	guint _tmp45_;
+	guint _tmp44_;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9620,7 +9772,7 @@ static void library_window_finalize (GObject * obj) {
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
 #line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self);
-#line 9623 "LibraryWindow.c"
+#line 9775 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp14_;
@@ -9649,116 +9801,113 @@ static void library_window_finalize (GObject * obj) {
 		_media_sources_it = _tmp19_;
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 9652 "LibraryWindow.c"
+#line 9804 "LibraryWindow.c"
 			GeeIterator* _tmp20_;
-			gboolean _tmp21_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp22_;
-			gpointer _tmp23_;
-			MediaSourceCollection* _tmp24_;
-			guint _tmp25_;
-			MediaSourceCollection* _tmp26_;
-			guint _tmp27_;
+			GeeIterator* _tmp21_;
+			gpointer _tmp22_;
+			MediaSourceCollection* _tmp23_;
+			guint _tmp24_;
+			MediaSourceCollection* _tmp25_;
+			guint _tmp26_;
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			if (!_tmp21_) {
+			if (!gee_iterator_next (_tmp20_)) {
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 9670 "LibraryWindow.c"
+#line 9819 "LibraryWindow.c"
 			}
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp22_ = _media_sources_it;
+			_tmp21_ = _media_sources_it;
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp23_ = gee_iterator_get (_tmp22_);
+			_tmp22_ = gee_iterator_get (_tmp21_);
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp23_;
+			media_sources = (MediaSourceCollection*) _tmp22_;
 #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp24_ = media_sources;
+			_tmp23_ = media_sources;
 #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE);
+			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp24_, NULL, FALSE);
 #line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
 #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp26_ = media_sources;
+			_tmp25_ = media_sources;
 #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE);
+			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp26_, NULL, FALSE);
 #line 235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
+			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 9692 "LibraryWindow.c"
+#line 9841 "LibraryWindow.c"
 		}
 #line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 9696 "LibraryWindow.c"
+#line 9845 "LibraryWindow.c"
 	}
 #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp28_ = metadata_writer_get_instance ();
+	_tmp27_ = metadata_writer_get_instance ();
 #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = _tmp28_;
+	_tmp28_ = _tmp27_;
 #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE);
+	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp29_, NULL, FALSE);
 #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self);
+	g_signal_handlers_disconnect_matched (_tmp28_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self);
 #line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp29_);
+	_g_object_unref0 (_tmp28_);
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = library_monitor_pool_get_instance ();
+	_tmp30_ = library_monitor_pool_get_instance ();
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = _tmp31_;
+	_tmp31_ = _tmp30_;
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = library_monitor_pool_get_monitor (_tmp32_);
+	_tmp32_ = library_monitor_pool_get_monitor (_tmp31_);
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = _tmp33_;
+	_tmp33_ = _tmp32_;
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp32_);
+	_library_monitor_pool_unref0 (_tmp31_);
 #line 240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp34_;
+	monitor = _tmp33_;
 #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = monitor;
+	_tmp34_ = monitor;
 #line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp35_ != NULL) {
-#line 9724 "LibraryWindow.c"
-		LibraryMonitor* _tmp36_;
+	if (_tmp34_ != NULL) {
+#line 9873 "LibraryWindow.c"
+		LibraryMonitor* _tmp35_;
 #line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp36_ = monitor;
+		_tmp35_ = monitor;
 #line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 9730 "LibraryWindow.c"
+		library_window_on_library_monitor_destroyed (self, _tmp35_);
+#line 9879 "LibraryWindow.c"
 	}
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp37_ = library_monitor_pool_get_instance ();
+	_tmp36_ = library_monitor_pool_get_instance ();
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_ = _tmp37_;
+	_tmp37_ = _tmp36_;
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE);
+	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp38_, NULL, FALSE);
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self);
+	g_signal_handlers_disconnect_matched (_tmp37_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self);
 #line 244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp38_);
+	_library_monitor_pool_unref0 (_tmp37_);
 #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp40_ = library_monitor_pool_get_instance ();
+	_tmp39_ = library_monitor_pool_get_instance ();
 #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp41_ = _tmp40_;
+	_tmp40_ = _tmp39_;
 #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE);
+	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp41_, NULL, FALSE);
 #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self);
+	g_signal_handlers_disconnect_matched (_tmp40_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self);
 #line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp41_);
+	_library_monitor_pool_unref0 (_tmp40_);
 #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp43_ = camera_table_get_instance ();
+	_tmp42_ = camera_table_get_instance ();
 #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44_ = _tmp43_;
+	_tmp43_ = _tmp42_;
 #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE);
+	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp44_, NULL, FALSE);
 #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self);
+	g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self);
 #line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_camera_table_unref0 (_tmp44_);
+	_camera_table_unref0 (_tmp43_);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
 #line 97 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9813,11 +9962,13 @@ static void library_window_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->toolbar_revealer);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_parent_class)->finalize (obj);
-#line 9816 "LibraryWindow.c"
+#line 9965 "LibraryWindow.c"
 }
 
 
-GType library_window_get_type (void) {
+GType
+library_window_get_type (void)
+{
 	static volatile gsize library_window_type_id__volatile = 0;
 	if (g_once_init_enter (&library_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryWindow), 0, (GInstanceInitFunc) library_window_instance_init, NULL };
@@ -9829,23 +9980,32 @@ GType library_window_get_type (void) {
 }
 
 
-static void _vala_library_window_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+static void
+_vala_library_window_get_property (GObject * object,
+                                   guint property_id,
+                                   GValue * value,
+                                   GParamSpec * pspec)
+{
 	LibraryWindow * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	switch (property_id) {
-#line 9837 "LibraryWindow.c"
+#line 9993 "LibraryWindow.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		break;
-#line 9843 "LibraryWindow.c"
+#line 9999 "LibraryWindow.c"
 	}
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -9857,13 +10017,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }
 
 
-static gint _vala_array_length (gpointer array) {
+static gint
+_vala_array_length (gpointer array)
+{
 	int length;
 	length = 0;
 	if (array) {
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index b3a06a0..3d18c3f 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.36.6, the Vala compiler
+/* OfflinePage.c generated by valac 0.40.4, the Vala compiler
  * generated from OfflinePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -199,6 +200,11 @@ typedef struct _OfflinePageOfflineSearchViewFilterClass OfflinePageOfflineSearch
 
 typedef struct _MediaViewTracker MediaViewTracker;
 typedef struct _MediaViewTrackerClass MediaViewTrackerClass;
+enum  {
+	OFFLINE_PAGE_0_PROPERTY,
+	OFFLINE_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* offline_page_properties[OFFLINE_PAGE_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -431,6 +437,11 @@ typedef struct _Dimensions Dimensions;
 typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate;
 typedef struct _ThumbnailPrivate ThumbnailPrivate;
 typedef struct _OfflinePageOfflineViewPrivate OfflinePageOfflineViewPrivate;
+enum  {
+	OFFLINE_PAGE_OFFLINE_VIEW_0_PROPERTY,
+	OFFLINE_PAGE_OFFLINE_VIEW_NUM_PROPERTIES
+};
+static GParamSpec* offline_page_offline_view_properties[OFFLINE_PAGE_OFFLINE_VIEW_NUM_PROPERTIES];
 typedef struct _ViewFilterPrivate ViewFilterPrivate;
 typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate;
 typedef struct _DefaultSearchViewFilterPrivate DefaultSearchViewFilterPrivate;
@@ -723,9 +734,15 @@ 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 checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -739,17 +756,29 @@ 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;
@@ -758,14 +787,17 @@ GType default_search_view_filter_get_type (void) G_GNUC_CONST;
 static GType offline_page_offline_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType media_view_tracker_get_type (void) G_GNUC_CONST;
 #define OFFLINE_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_OFFLINE_PAGE, OfflinePagePrivate))
-enum  {
-	OFFLINE_PAGE_DUMMY_PROPERTY
-};
 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;
@@ -775,85 +807,135 @@ GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
-static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed);
-static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void offline_page_on_offline_contents_altered (OfflinePage* self,
+                                               GeeCollection* added,
+                                               GeeCollection* removed);
+static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                                 GeeCollection* added,
+                                                                                                 GeeCollection* removed,
+                                                                                                 gpointer self);
 GType video_source_collection_get_type (void) G_GNUC_CONST;
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void);
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type);
 #define OFFLINE_PAGE_NAME _ ("Missing Files")
 static void offline_page_on_remove_from_library (OfflinePage* self);
-static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
 OfflinePage* offline_page_new (void);
 OfflinePage* offline_page_construct (GType object_type);
-CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
-void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path);
-void page_init_toolbar (Page* self, const gchar* path);
+CheckerboardPage* checkerboard_page_construct (GType object_type,
+                                               const gchar* page_name);
+void checkerboard_page_init_item_context_menu (CheckerboardPage* self,
+                                               const gchar* path);
+void page_init_toolbar (Page* self,
+                        const gchar* path);
 GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 MediaViewTracker* media_view_tracker_new (ViewCollection* collection);
-MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection);
+MediaViewTracker* media_view_tracker_construct (GType object_type,
+                                                ViewCollection* collection);
 GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self);
-static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void offline_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void offline_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
+static void offline_page_real_init_collect_ui_filenames (Page* base,
+                                                  GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void offline_page_real_add_actions (Page* base,
+                                    GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+static void offline_page_real_remove_actions (Page* base,
+                                       GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
 static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base);
-static void offline_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);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
+static void offline_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);
+gboolean data_collection_add (DataCollection* self,
+                              DataObject* object);
 static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source);
-static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source);
+static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type,
+                                                             MediaSource* source);
 GType media_source_item_get_type (void) G_GNUC_CONST;
 GType thumbnail_get_type (void) G_GNUC_CONST;
 static GType offline_page_offline_view_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType marker_get_type (void) G_GNUC_CONST;
 Marker* data_collection_start_marking (DataCollection* self);
-void marker_mark (Marker* self, DataObject* object);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
-void data_collection_remove_marked (DataCollection* self, Marker* m);
+void marker_mark (Marker* self,
+                  DataObject* object);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+                                               DataSource* source);
+void data_collection_remove_marked (DataCollection* self,
+                                    Marker* m);
 GeeList* view_collection_get_selected_sources (ViewCollection* self);
-gboolean remove_offline_dialog (GtkWindow* owner, gint count);
+gboolean remove_offline_dialog (GtkWindow* owner,
+                                gint count);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 void page_window_set_busy_cursor (PageWindow* self);
 GType progress_dialog_get_type (void) G_GNUC_CONST;
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
+ProgressDialog* progress_dialog_new (GtkWindow* owner,
+                                     const gchar* text,
+                                     GCancellable* cancellable);
+ProgressDialog* progress_dialog_construct (GType object_type,
+                                           GtkWindow* owner,
+                                           const gchar* text,
+                                           GCancellable* cancellable);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType library_photo_get_type (void) G_GNUC_CONST;
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
-void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos);
-void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
+void media_source_collection_filter_media (GeeCollection* media,
+                                           GeeCollection* photos,
+                                           GeeCollection* videos);
+void media_source_collection_remove_from_app (MediaSourceCollection* self,
+                                              GeeCollection* sources,
+                                              gboolean delete_backing,
+                                              ProgressMonitor monitor,
+                                              void* monitor_target,
+                                              GeeList* not_removed);
+gboolean progress_dialog_monitor (ProgressDialog* self,
+                                  guint64 count,
+                                  guint64 total,
+                                  gboolean do_event_loop);
+static gboolean _progress_dialog_monitor_progress_monitor (guint64 current,
+                                                    guint64 total,
+                                                    gboolean do_event_loop,
+                                                    gpointer self);
 void progress_dialog_close (ProgressDialog* self);
 void page_window_set_normal_cursor (PageWindow* self);
 static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base);
 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;
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
-enum  {
-	OFFLINE_PAGE_OFFLINE_VIEW_DUMMY_PROPERTY
-};
 gint thumbnail_get_DEFAULT_SCALE (void);
-Thumbnail* thumbnail_new (MediaSource* media, gint scale);
-Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale);
+Thumbnail* thumbnail_new (MediaSource* media,
+                          gint scale);
+Thumbnail* thumbnail_construct (GType object_type,
+                                MediaSource* media,
+                                gint scale);
 gboolean media_source_is_offline (MediaSource* self);
-enum  {
-	OFFLINE_PAGE_OFFLINE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
 static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
@@ -861,21 +943,32 @@ static void offline_page_finalize (GObject * obj);
 
 static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offline_page_on_remove_from_library_gsimple_action_activate_callback}};
 
-static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                            GeeCollection* added,
+                                                                                            GeeCollection* removed,
+                                                                                            gpointer self)
+{
 #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_on_offline_contents_altered ((OfflinePage*) self, added, removed);
-#line 868 "OfflinePage.c"
+#line 955 "OfflinePage.c"
 }
 
 
-static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_on_remove_from_library ((OfflinePage*) self);
-#line 875 "OfflinePage.c"
+#line 966 "OfflinePage.c"
 }
 
 
-OfflinePage* offline_page_construct (GType object_type) {
+OfflinePage*
+offline_page_construct (GType object_type)
+{
 	OfflinePage * self = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -936,69 +1029,65 @@ OfflinePage* offline_page_construct (GType object_type) {
 	_g_object_unref0 (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 940 "OfflinePage.c"
+#line 1033 "OfflinePage.c"
 }
 
 
-OfflinePage* offline_page_new (void) {
+OfflinePage*
+offline_page_new (void)
+{
 #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_construct (TYPE_OFFLINE_PAGE);
-#line 947 "OfflinePage.c"
+#line 1042 "OfflinePage.c"
 }
 
 
-static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+offline_page_real_init_collect_ui_filenames (Page* base,
+                                             GeeList* ui_filenames)
+{
 	OfflinePage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 50 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = ui_filenames;
-#line 50 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = ui_filenames;
+	PAGE_CLASS (offline_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames);
 #line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui");
-#line 967 "OfflinePage.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui");
+#line 1059 "OfflinePage.c"
 }
 
 
-static void offline_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+offline_page_real_add_actions (Page* base,
+                               GActionMap* map)
+{
 	OfflinePage * self;
-	GActionMap* _tmp0_;
-	GActionMap* _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = map;
-#line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = map;
+	PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	g_action_map_add_action_entries (_tmp1_, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self);
-#line 987 "OfflinePage.c"
+	g_action_map_add_action_entries (map, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self);
+#line 1076 "OfflinePage.c"
 }
 
 
-static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+offline_page_real_remove_actions (Page* base,
+                                  GActionMap* map)
+{
 	OfflinePage * self;
-	GActionMap* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = map;
-#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 1002 "OfflinePage.c"
+	PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
+#line 1091 "OfflinePage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1010,38 +1099,39 @@ static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (OFFLINE_PAGE_entries);
 #line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (OFFLINE_PAGE_entries); entry_it = entry_it + 1) {
-#line 1014 "OfflinePage.c"
+#line 1103 "OfflinePage.c"
 			GActionEntry entry = {0};
 #line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			entry = entry_collection[entry_it];
-#line 1018 "OfflinePage.c"
+#line 1107 "OfflinePage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
-#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp1_ = map;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp2_ = entry;
+				_tmp0_ = entry;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp3_ = _tmp2_.name;
+				_tmp1_ = _tmp0_.name;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1031 "OfflinePage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 1117 "OfflinePage.c"
 			}
 		}
 	}
 }
 
 
-static gpointer _core_tracker_ref0 (gpointer self) {
+static gpointer
+_core_tracker_ref0 (gpointer self)
+{
 #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 1041 "OfflinePage.c"
+#line 1129 "OfflinePage.c"
 }
 
 
-static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base) {
+static CoreViewTracker*
+offline_page_real_get_view_tracker (CheckerboardPage* base)
+{
 	OfflinePage * self;
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_;
@@ -1056,34 +1146,31 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba
 	result = _tmp1_;
 #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1060 "OfflinePage.c"
+#line 1150 "OfflinePage.c"
 }
 
 
-static void offline_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+offline_page_real_update_actions (Page* base,
+                                  gint selected_count,
+                                  gint count)
+{
 	OfflinePage * self;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 76 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = selected_count;
-#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp0_ > 0);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", selected_count > 0);
 #line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = selected_count;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_ = count;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 1081 "OfflinePage.c"
+	PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count);
+#line 1166 "OfflinePage.c"
 }
 
 
-static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_;
-	GeeCollection* _tmp12_;
+static void
+offline_page_on_offline_contents_altered (OfflinePage* self,
+                                          GeeCollection* added,
+                                          GeeCollection* removed)
+{
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1091,193 +1178,184 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = added;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp0_ != NULL) {
-#line 1098 "OfflinePage.c"
+	if (added != NULL) {
+#line 1183 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_;
-			GeeIterator* _tmp2_;
+			GeeIterator* _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp1_ = added;
+			_tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable));
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_source_it = _tmp2_;
+			_source_it = _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1111 "OfflinePage.c"
-				GeeIterator* _tmp3_;
-				gboolean _tmp4_;
+#line 1193 "OfflinePage.c"
+				GeeIterator* _tmp1_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp5_;
-				gpointer _tmp6_;
-				ViewCollection* _tmp7_;
-				ViewCollection* _tmp8_;
-				MediaSource* _tmp9_;
-				OfflinePageOfflineView* _tmp10_;
-				OfflinePageOfflineView* _tmp11_;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp3_ = _source_it;
+				GeeIterator* _tmp2_;
+				gpointer _tmp3_;
+				ViewCollection* _tmp4_;
+				ViewCollection* _tmp5_;
+				MediaSource* _tmp6_;
+				OfflinePageOfflineView* _tmp7_;
+				OfflinePageOfflineView* _tmp8_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp4_ = gee_iterator_next (_tmp3_);
+				_tmp1_ = _source_it;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				if (!_tmp4_) {
+				if (!gee_iterator_next (_tmp1_)) {
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1130 "OfflinePage.c"
+#line 1209 "OfflinePage.c"
 				}
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp5_ = _source_it;
+				_tmp2_ = _source_it;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp6_ = gee_iterator_get (_tmp5_);
+				_tmp3_ = gee_iterator_get (_tmp2_);
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				source = (MediaSource*) _tmp6_;
+				source = (MediaSource*) _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp8_ = _tmp7_;
+				_tmp5_ = _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp9_ = source;
+				_tmp6_ = source;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp10_ = offline_page_offline_view_new (_tmp9_);
+				_tmp7_ = offline_page_offline_view_new (_tmp6_);
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp11_ = _tmp10_;
+				_tmp8_ = _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
+				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_g_object_unref0 (_tmp11_);
+				_g_object_unref0 (_tmp8_);
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_data_collection_unref0 (_tmp8_);
+				_data_collection_unref0 (_tmp5_);
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1156 "OfflinePage.c"
+#line 1235 "OfflinePage.c"
 			}
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1160 "OfflinePage.c"
+#line 1239 "OfflinePage.c"
 		}
 	}
 #line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp12_ = removed;
-#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp12_ != NULL) {
-#line 1167 "OfflinePage.c"
+	if (removed != NULL) {
+#line 1244 "OfflinePage.c"
 		Marker* marker = NULL;
-		ViewCollection* _tmp13_;
-		ViewCollection* _tmp14_;
-		Marker* _tmp15_;
-		Marker* _tmp16_;
-		ViewCollection* _tmp29_;
-		ViewCollection* _tmp30_;
-		Marker* _tmp31_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		Marker* _tmp11_;
+		Marker* _tmp12_;
+		ViewCollection* _tmp23_;
+		ViewCollection* _tmp24_;
+		Marker* _tmp25_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp10_ = _tmp9_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
+		_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp12_ = _tmp11_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_data_collection_unref0 (_tmp14_);
+		_data_collection_unref0 (_tmp10_);
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		marker = _tmp16_;
-#line 1188 "OfflinePage.c"
+		marker = _tmp12_;
+#line 1265 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp17_;
-			GeeIterator* _tmp18_;
+			GeeIterator* _tmp13_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp17_ = removed;
+			_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable));
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_source_it = _tmp18_;
+			_source_it = _tmp13_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1201 "OfflinePage.c"
-				GeeIterator* _tmp19_;
-				gboolean _tmp20_;
+#line 1275 "OfflinePage.c"
+				GeeIterator* _tmp14_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp21_;
-				gpointer _tmp22_;
-				Marker* _tmp23_;
-				ViewCollection* _tmp24_;
-				ViewCollection* _tmp25_;
-				MediaSource* _tmp26_;
-				DataView* _tmp27_;
-				DataView* _tmp28_;
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp19_ = _source_it;
+				GeeIterator* _tmp15_;
+				gpointer _tmp16_;
+				Marker* _tmp17_;
+				ViewCollection* _tmp18_;
+				ViewCollection* _tmp19_;
+				MediaSource* _tmp20_;
+				DataView* _tmp21_;
+				DataView* _tmp22_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp20_ = gee_iterator_next (_tmp19_);
+				_tmp14_ = _source_it;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				if (!_tmp20_) {
+				if (!gee_iterator_next (_tmp14_)) {
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1221 "OfflinePage.c"
+#line 1292 "OfflinePage.c"
 				}
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp21_ = _source_it;
+				_tmp15_ = _source_it;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp22_ = gee_iterator_get (_tmp21_);
+				_tmp16_ = gee_iterator_get (_tmp15_);
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				source = (MediaSource*) _tmp22_;
+				source = (MediaSource*) _tmp16_;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp23_ = marker;
+				_tmp17_ = marker;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp25_ = _tmp24_;
+				_tmp19_ = _tmp18_;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp26_ = source;
+				_tmp20_ = source;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
+				_tmp21_ = view_collection_get_view_for_source (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_SOURCE, DataSource));
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp28_ = _tmp27_;
+				_tmp22_ = _tmp21_;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
+				marker_mark (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_g_object_unref0 (_tmp28_);
+				_g_object_unref0 (_tmp22_);
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_data_collection_unref0 (_tmp25_);
+				_data_collection_unref0 (_tmp19_);
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1249 "OfflinePage.c"
+#line 1320 "OfflinePage.c"
 			}
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1253 "OfflinePage.c"
+#line 1324 "OfflinePage.c"
 		}
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp30_ = _tmp29_;
+		_tmp24_ = _tmp23_;
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp31_ = marker;
+		_tmp25_ = marker;
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
+		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_);
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_data_collection_unref0 (_tmp30_);
+		_data_collection_unref0 (_tmp24_);
 #line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (marker);
-#line 1267 "OfflinePage.c"
+#line 1338 "OfflinePage.c"
 	}
 }
 
 
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
+static gboolean
+_progress_dialog_monitor_progress_monitor (guint64 current,
+                                           guint64 total,
+                                           gboolean do_event_loop,
+                                           gpointer self)
+{
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1277 "OfflinePage.c"
+#line 1353 "OfflinePage.c"
 }
 
 
-static void offline_page_on_remove_from_library (OfflinePage* self) {
+static void
+offline_page_on_remove_from_library (OfflinePage* self)
+{
 	GeeCollection* sources = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -1292,24 +1370,23 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 	gint _tmp10_;
 	gint _tmp11_;
 	gboolean _tmp12_;
-	gboolean _tmp13_;
+	AppWindow* _tmp13_;
 	AppWindow* _tmp14_;
-	AppWindow* _tmp15_;
 	ProgressDialog* progress = NULL;
-	GeeCollection* _tmp16_;
+	GeeCollection* _tmp15_;
+	gint _tmp16_;
 	gint _tmp17_;
-	gint _tmp18_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp22_;
+	GeeArrayList* _tmp21_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp23_;
-	GeeCollection* _tmp24_;
+	GeeArrayList* _tmp22_;
+	GeeCollection* _tmp23_;
+	GeeArrayList* _tmp24_;
 	GeeArrayList* _tmp25_;
-	GeeArrayList* _tmp26_;
-	ProgressDialog* _tmp27_;
-	ProgressDialog* _tmp38_;
+	ProgressDialog* _tmp26_;
+	ProgressDialog* _tmp37_;
+	AppWindow* _tmp39_;
 	AppWindow* _tmp40_;
-	AppWindow* _tmp41_;
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
 #line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1336,7 +1413,7 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 		_g_object_unref0 (sources);
 #line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1340 "OfflinePage.c"
+#line 1417 "OfflinePage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp7_ = app_window_get_instance ();
@@ -1349,140 +1426,138 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp11_ = _tmp10_;
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp12_ = remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_);
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp13_ = !_tmp12_;
+	_tmp12_ = !remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_);
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp8_);
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp13_) {
+	if (_tmp12_) {
 #line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (sources);
 #line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1364 "OfflinePage.c"
+#line 1439 "OfflinePage.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp14_ = app_window_get_instance ();
+	_tmp13_ = app_window_get_instance ();
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_g_object_unref0 (_tmp15_);
+	_g_object_unref0 (_tmp14_);
 #line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	progress = NULL;
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp16_ = sources;
+	_tmp15_ = sources;
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp17_ = gee_collection_get_size (_tmp16_);
+	_tmp16_ = gee_collection_get_size (_tmp15_);
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp18_ = _tmp17_;
+	_tmp17_ = _tmp16_;
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp18_ >= 20) {
-#line 1384 "OfflinePage.c"
+	if (_tmp17_ >= 20) {
+#line 1459 "OfflinePage.c"
+		AppWindow* _tmp18_;
 		AppWindow* _tmp19_;
-		AppWindow* _tmp20_;
-		ProgressDialog* _tmp21_;
+		ProgressDialog* _tmp20_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp19_ = app_window_get_instance ();
+		_tmp18_ = app_window_get_instance ();
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp21_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL);
+		_tmp20_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		g_object_ref_sink (_tmp21_);
+		g_object_ref_sink (_tmp20_);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (progress);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		progress = _tmp21_;
+		progress = _tmp20_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_g_object_unref0 (_tmp20_);
-#line 1402 "OfflinePage.c"
+		_g_object_unref0 (_tmp19_);
+#line 1477 "OfflinePage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp22_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp21_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	photos = _tmp22_;
+	photos = _tmp21_;
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp23_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp22_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	videos = _tmp23_;
+	videos = _tmp22_;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp24_ = sources;
+	_tmp23_ = sources;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp25_ = photos;
+	_tmp24_ = photos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp26_ = videos;
+	_tmp25_ = videos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	media_source_collection_filter_media (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+	media_source_collection_filter_media (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp27_ = progress;
+	_tmp26_ = progress;
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp27_ != NULL) {
-#line 1424 "OfflinePage.c"
-		LibraryPhotoSourceCollection* _tmp28_;
-		GeeArrayList* _tmp29_;
-		ProgressDialog* _tmp30_;
-		VideoSourceCollection* _tmp31_;
-		GeeArrayList* _tmp32_;
-		ProgressDialog* _tmp33_;
+	if (_tmp26_ != NULL) {
+#line 1499 "OfflinePage.c"
+		LibraryPhotoSourceCollection* _tmp27_;
+		GeeArrayList* _tmp28_;
+		ProgressDialog* _tmp29_;
+		VideoSourceCollection* _tmp30_;
+		GeeArrayList* _tmp31_;
+		ProgressDialog* _tmp32_;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp28_ = library_photo_global;
+		_tmp27_ = library_photo_global;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp29_ = photos;
+		_tmp28_ = photos;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp30_ = progress;
+		_tmp29_ = progress;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp30_, NULL);
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp29_, NULL);
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp31_ = video_global;
+		_tmp30_ = video_global;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp32_ = videos;
+		_tmp31_ = videos;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp33_ = progress;
+		_tmp32_ = progress;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp33_, NULL);
-#line 1447 "OfflinePage.c"
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp32_, NULL);
+#line 1522 "OfflinePage.c"
 	} else {
-		LibraryPhotoSourceCollection* _tmp34_;
-		GeeArrayList* _tmp35_;
-		VideoSourceCollection* _tmp36_;
-		GeeArrayList* _tmp37_;
+		LibraryPhotoSourceCollection* _tmp33_;
+		GeeArrayList* _tmp34_;
+		VideoSourceCollection* _tmp35_;
+		GeeArrayList* _tmp36_;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp34_ = library_photo_global;
+		_tmp33_ = library_photo_global;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp35_ = photos;
+		_tmp34_ = photos;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp36_ = video_global;
+		_tmp35_ = video_global;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp37_ = videos;
+		_tmp36_ = videos;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
-#line 1465 "OfflinePage.c"
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
+#line 1540 "OfflinePage.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp38_ = progress;
+	_tmp37_ = progress;
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp38_ != NULL) {
-#line 1471 "OfflinePage.c"
-		ProgressDialog* _tmp39_;
+	if (_tmp37_ != NULL) {
+#line 1546 "OfflinePage.c"
+		ProgressDialog* _tmp38_;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp39_ = progress;
+		_tmp38_ = progress;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		progress_dialog_close (_tmp39_);
-#line 1477 "OfflinePage.c"
+		progress_dialog_close (_tmp38_);
+#line 1552 "OfflinePage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp40_ = app_window_get_instance ();
+	_tmp39_ = app_window_get_instance ();
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp41_ = _tmp40_;
+	_tmp40_ = _tmp39_;
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE_WINDOW, PageWindow));
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_g_object_unref0 (_tmp41_);
+	_g_object_unref0 (_tmp40_);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (videos);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1491,18 +1566,22 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 	_g_object_unref0 (progress);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (sources);
-#line 1495 "OfflinePage.c"
+#line 1570 "OfflinePage.c"
 }
 
 
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1502 "OfflinePage.c"
+#line 1579 "OfflinePage.c"
 }
 
 
-static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+offline_page_real_get_search_view_filter (CheckerboardPage* base)
+{
 	OfflinePage * self;
 	SearchViewFilter* result = NULL;
 	OfflinePageOfflineSearchViewFilter* _tmp0_;
@@ -1517,58 +1596,60 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP
 	result = _tmp1_;
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1521 "OfflinePage.c"
+#line 1600 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source) {
+static OfflinePageOfflineView*
+offline_page_offline_view_construct (GType object_type,
+                                     MediaSource* source)
+{
 	OfflinePageOfflineView * self = NULL;
-	MediaSource* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	gint _tmp2_;
-	MediaSource* _tmp3_;
-	gboolean _tmp4_;
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = source;
-#line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = thumbnail_get_DEFAULT_SCALE ();
+	_tmp0_ = thumbnail_get_DEFAULT_SCALE ();
 #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	self = (OfflinePageOfflineView*) thumbnail_construct (object_type, _tmp0_, _tmp2_);
-#line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp3_ = source;
-#line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp4_ = media_source_is_offline (_tmp3_);
+	self = (OfflinePageOfflineView*) thumbnail_construct (object_type, source, _tmp1_);
 #line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_vala_assert (_tmp4_, "source.is_offline()");
+	_vala_assert (media_source_is_offline (source), "source.is_offline()");
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1550 "OfflinePage.c"
+#line 1623 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source) {
+static OfflinePageOfflineView*
+offline_page_offline_view_new (MediaSource* source)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_view_construct (OFFLINE_PAGE_TYPE_OFFLINE_VIEW, source);
-#line 1557 "OfflinePage.c"
+#line 1632 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) {
+static void
+offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_view_parent_class = g_type_class_peek_parent (klass);
-#line 1564 "OfflinePage.c"
+#line 1641 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_view_instance_init (OfflinePageOfflineView * self) {
+static void
+offline_page_offline_view_instance_init (OfflinePageOfflineView * self)
+{
 }
 
 
-static GType offline_page_offline_view_get_type (void) {
+static GType
+offline_page_offline_view_get_type (void)
+{
 	static volatile gsize offline_page_offline_view_type_id__volatile = 0;
 	if (g_once_init_enter (&offline_page_offline_view_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (OfflinePageOfflineViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_offline_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePageOfflineView), 0, (GInstanceInitFunc) offline_page_offline_view_instance_init, NULL };
@@ -1580,7 +1661,9 @@ static GType offline_page_offline_view_get_type (void) {
 }
 
 
-static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
 	OfflinePageOfflineSearchViewFilter * self;
 	guint result = 0U;
 #line 19 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1589,41 +1672,51 @@ static guint offline_page_offline_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1593 "OfflinePage.c"
+#line 1676 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type) {
+static OfflinePageOfflineSearchViewFilter*
+offline_page_offline_search_view_filter_construct (GType object_type)
+{
 	OfflinePageOfflineSearchViewFilter* self = NULL;
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1603 "OfflinePage.c"
+#line 1688 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void) {
+static OfflinePageOfflineSearchViewFilter*
+offline_page_offline_search_view_filter_new (void)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_search_view_filter_construct (OFFLINE_PAGE_TYPE_OFFLINE_SEARCH_VIEW_FILTER);
-#line 1610 "OfflinePage.c"
+#line 1697 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_search_view_filter_class_init (OfflinePageOfflineSearchViewFilterClass * klass) {
+static void
+offline_page_offline_search_view_filter_class_init (OfflinePageOfflineSearchViewFilterClass * klass)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) offline_page_offline_search_view_filter_real_get_criteria;
-#line 1619 "OfflinePage.c"
+#line 1708 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_search_view_filter_instance_init (OfflinePageOfflineSearchViewFilter * self) {
+static void
+offline_page_offline_search_view_filter_instance_init (OfflinePageOfflineSearchViewFilter * self)
+{
 }
 
 
-static GType offline_page_offline_search_view_filter_get_type (void) {
+static GType
+offline_page_offline_search_view_filter_get_type (void)
+{
 	static volatile gsize offline_page_offline_search_view_filter_type_id__volatile = 0;
 	if (g_once_init_enter (&offline_page_offline_search_view_filter_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (OfflinePageOfflineSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_offline_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePageOfflineSearchViewFilter), 0, (GInstanceInitFunc) offline_page_offline_search_view_filter_instance_init, NULL };
@@ -1635,7 +1728,9 @@ static GType offline_page_offline_search_view_filter_get_type (void) {
 }
 
 
-static void offline_page_class_init (OfflinePageClass * klass) {
+static void
+offline_page_class_init (OfflinePageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1654,11 +1749,13 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) offline_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = offline_page_finalize;
-#line 1658 "OfflinePage.c"
+#line 1753 "OfflinePage.c"
 }
 
 
-static void offline_page_instance_init (OfflinePage * self) {
+static void
+offline_page_instance_init (OfflinePage * self)
+{
 	OfflinePageOfflineSearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv = OFFLINE_PAGE_GET_PRIVATE (self);
@@ -1666,11 +1763,13 @@ static void offline_page_instance_init (OfflinePage * self) {
 	_tmp0_ = offline_page_offline_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1670 "OfflinePage.c"
+#line 1767 "OfflinePage.c"
 }
 
 
-static void offline_page_finalize (GObject * obj) {
+static void
+offline_page_finalize (GObject * obj)
+{
 	OfflinePage * self;
 	LibraryPhotoSourceCollection* _tmp0_;
 	guint _tmp1_;
@@ -1696,11 +1795,13 @@ static void offline_page_finalize (GObject * obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (offline_page_parent_class)->finalize (obj);
-#line 1700 "OfflinePage.c"
+#line 1799 "OfflinePage.c"
 }
 
 
-GType offline_page_get_type (void) {
+GType
+offline_page_get_type (void)
+{
 	static volatile gsize offline_page_type_id__volatile = 0;
 	if (g_once_init_enter (&offline_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (OfflinePageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePage), 0, (GInstanceInitFunc) offline_page_instance_init, NULL };
diff --git a/src/library/OfflineSidebarEntry.c b/src/library/OfflineSidebarEntry.c
index 0be13f0..712a354 100644
--- a/src/library/OfflineSidebarEntry.c
+++ b/src/library/OfflineSidebarEntry.c
@@ -1,4 +1,4 @@
-/* OfflineSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* OfflineSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from OfflineSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -101,6 +102,11 @@ typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
 typedef struct _LibraryOfflineSidebarEntry LibraryOfflineSidebarEntry;
 typedef struct _LibraryOfflineSidebarEntryClass LibraryOfflineSidebarEntryClass;
 typedef struct _LibraryOfflineSidebarEntryPrivate LibraryOfflineSidebarEntryPrivate;
+enum  {
+	LIBRARY_OFFLINE_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_OFFLINE_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_offline_sidebar_entry_properties[LIBRARY_OFFLINE_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -284,14 +290,17 @@ GType sidebar_contextable_get_type (void) G_GNUC_CONST;
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType library_hideable_page_entry_get_type (void) G_GNUC_CONST;
 GType library_offline_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_OFFLINE_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 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;
@@ -299,9 +308,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);
@@ -311,13 +326,20 @@ GType data_object_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
-static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                                   GeeCollection* added,
+                                                                                                                   GeeCollection* removed,
+                                                                                                                   gpointer self);
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void);
 LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type);
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
-static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                                                  GeeCollection* added,
+                                                                                                                  GeeCollection* removed,
+                                                                                                                  gpointer self);
 static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self);
 static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 #define OFFLINE_PAGE_NAME _ ("Missing Files")
@@ -331,26 +353,37 @@ GType offline_page_get_type (void) G_GNUC_CONST;
 static void library_offline_sidebar_entry_finalize (GObject * obj);
 
 
-static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                              GeeCollection* added,
+                                                                                                              GeeCollection* removed,
+                                                                                                              gpointer self)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_on_offline_contents_altered ((LibraryOfflineSidebarEntry*) self);
-#line 338 "OfflineSidebarEntry.c"
+#line 365 "OfflineSidebarEntry.c"
 }
 
 
-static void _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                                             GeeCollection* added,
+                                                                                                             GeeCollection* removed,
+                                                                                                             gpointer self)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_on_offline_contents_altered ((LibraryOfflineSidebarEntry*) self);
-#line 345 "OfflineSidebarEntry.c"
+#line 377 "OfflineSidebarEntry.c"
 }
 
 
-LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType object_type) {
+LibraryOfflineSidebarEntry*
+library_offline_sidebar_entry_construct (GType object_type)
+{
 	LibraryOfflineSidebarEntry * self = NULL;
-	gint _tmp11_;
 #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = (LibraryOfflineSidebarEntry*) library_hideable_page_entry_construct (object_type);
-#line 354 "OfflineSidebarEntry.c"
+#line 387 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -379,78 +412,76 @@ LibraryOfflineSidebarEntry* library_offline_sidebar_entry_construct (GType objec
 		_media_sources_it = _tmp5_;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
-#line 383 "OfflineSidebarEntry.c"
+#line 416 "OfflineSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 				break;
-#line 398 "OfflineSidebarEntry.c"
+#line 428 "OfflineSidebarEntry.c"
 			}
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 11 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			g_signal_connect_object (_tmp10_, "offline-contents-altered", (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "offline-contents-altered", (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_offline_contents_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 412 "OfflineSidebarEntry.c"
+#line 442 "OfflineSidebarEntry.c"
 		}
 #line 10 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 416 "OfflineSidebarEntry.c"
+#line 446 "OfflineSidebarEntry.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	_tmp11_ = library_offline_sidebar_entry_get_total_offline (self);
-#line 13 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp11_ != 0);
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_offline_sidebar_entry_get_total_offline (self) != 0);
 #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return self;
-#line 424 "OfflineSidebarEntry.c"
+#line 452 "OfflineSidebarEntry.c"
 }
 
 
-LibraryOfflineSidebarEntry* library_offline_sidebar_entry_new (void) {
+LibraryOfflineSidebarEntry*
+library_offline_sidebar_entry_new (void)
+{
 #line 8 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return library_offline_sidebar_entry_construct (LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY);
-#line 431 "OfflineSidebarEntry.c"
+#line 461 "OfflineSidebarEntry.c"
 }
 
 
-static void library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self) {
-	gint _tmp0_;
+static void
+library_offline_sidebar_entry_on_offline_contents_altered (LibraryOfflineSidebarEntry* self)
+{
 #line 21 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self));
 #line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	_tmp0_ = library_offline_sidebar_entry_get_total_offline (self);
-#line 22 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp0_ != 0);
-#line 443 "OfflineSidebarEntry.c"
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_offline_sidebar_entry_get_total_offline (self) != 0);
+#line 472 "OfflineSidebarEntry.c"
 }
 
 
-static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self) {
+static gint
+library_offline_sidebar_entry_get_total_offline (LibraryOfflineSidebarEntry* self)
+{
 	gint result = 0;
 	gint total = 0;
 #line 25 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	g_return_val_if_fail (LIBRARY_IS_OFFLINE_SIDEBAR_ENTRY (self), 0);
 #line 26 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	total = 0;
-#line 454 "OfflineSidebarEntry.c"
+#line 485 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -479,67 +510,66 @@ static gint library_offline_sidebar_entry_get_total_offline (LibraryOfflineSideb
 		_media_sources_it = _tmp5_;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
-#line 483 "OfflineSidebarEntry.c"
+#line 514 "OfflineSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			gint _tmp10_;
-			MediaSourceCollection* _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			gint _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			GeeCollection* _tmp11_;
 			GeeCollection* _tmp12_;
-			GeeCollection* _tmp13_;
+			gint _tmp13_;
 			gint _tmp14_;
-			gint _tmp15_;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 				break;
-#line 503 "OfflineSidebarEntry.c"
+#line 531 "OfflineSidebarEntry.c"
 			}
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp10_ = total;
+			_tmp9_ = total;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp11_ = media_sources;
+			_tmp10_ = media_sources;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp12_ = media_source_collection_get_offline_bin_contents (_tmp11_);
+			_tmp11_ = media_source_collection_get_offline_bin_contents (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp13_ = _tmp12_;
+			_tmp12_ = _tmp11_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp14_ = gee_collection_get_size (_tmp13_);
+			_tmp13_ = gee_collection_get_size (_tmp12_);
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp15_ = _tmp14_;
+			_tmp14_ = _tmp13_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			total = _tmp10_ + _tmp15_;
+			total = _tmp9_ + _tmp14_;
 #line 28 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_g_object_unref0 (_tmp13_);
+			_g_object_unref0 (_tmp12_);
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 529 "OfflineSidebarEntry.c"
+#line 557 "OfflineSidebarEntry.c"
 		}
 #line 27 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 533 "OfflineSidebarEntry.c"
+#line 561 "OfflineSidebarEntry.c"
 	}
 #line 30 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	result = total;
 #line 30 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 539 "OfflineSidebarEntry.c"
+#line 567 "OfflineSidebarEntry.c"
 }
 
 
-static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -551,11 +581,13 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_name (SidebarSimple
 	result = _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 555 "OfflineSidebarEntry.c"
+#line 585 "OfflineSidebarEntry.c"
 }
 
 
-static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryOfflineSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -567,11 +599,13 @@ static gchar* library_offline_sidebar_entry_real_get_sidebar_icon (SidebarSimple
 	result = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 571 "OfflineSidebarEntry.c"
+#line 603 "OfflineSidebarEntry.c"
 }
 
 
-static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_offline_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryOfflineSidebarEntry * self;
 	Page* result = NULL;
 	OfflinePage* _tmp0_;
@@ -585,11 +619,13 @@ static Page* library_offline_sidebar_entry_real_create_page (SidebarSimplePageEn
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 42 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	return result;
-#line 589 "OfflineSidebarEntry.c"
+#line 623 "OfflineSidebarEntry.c"
 }
 
 
-static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntryClass * klass) {
+static void
+library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntryClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	library_offline_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
@@ -600,19 +636,23 @@ static void library_offline_sidebar_entry_class_init (LibraryOfflineSidebarEntry
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_offline_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_offline_sidebar_entry_finalize;
-#line 604 "OfflineSidebarEntry.c"
+#line 640 "OfflineSidebarEntry.c"
 }
 
 
-static void library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEntry * self) {
+static void
+library_offline_sidebar_entry_instance_init (LibraryOfflineSidebarEntry * self)
+{
 }
 
 
-static void library_offline_sidebar_entry_finalize (GObject * obj) {
+static void
+library_offline_sidebar_entry_finalize (GObject * obj)
+{
 	LibraryOfflineSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, LibraryOfflineSidebarEntry);
-#line 616 "OfflineSidebarEntry.c"
+#line 656 "OfflineSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -641,51 +681,50 @@ static void library_offline_sidebar_entry_finalize (GObject * obj) {
 		_media_sources_it = _tmp5_;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		while (TRUE) {
-#line 645 "OfflineSidebarEntry.c"
+#line 685 "OfflineSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			guint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
+			guint _tmp10_;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 				break;
-#line 661 "OfflineSidebarEntry.c"
+#line 698 "OfflineSidebarEntry.c"
 			}
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_offline_sidebar_entry_on_offline_contents_altered_media_source_collection_trashcan_contents_altered, self);
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 677 "OfflineSidebarEntry.c"
+#line 714 "OfflineSidebarEntry.c"
 		}
 #line 17 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 681 "OfflineSidebarEntry.c"
+#line 718 "OfflineSidebarEntry.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/library/OfflineSidebarEntry.vala"
 	G_OBJECT_CLASS (library_offline_sidebar_entry_parent_class)->finalize (obj);
-#line 685 "OfflineSidebarEntry.c"
+#line 722 "OfflineSidebarEntry.c"
 }
 
 
-GType library_offline_sidebar_entry_get_type (void) {
+GType
+library_offline_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_offline_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_offline_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryOfflineSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_offline_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryOfflineSidebarEntry), 0, (GInstanceInitFunc) library_offline_sidebar_entry_instance_init, NULL };
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 1e3ffc8..9d1f7a9 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -1,4 +1,4 @@
-/* TrashPage.c generated by valac 0.36.6, the Vala compiler
+/* TrashPage.c generated by valac 0.40.4, the Vala compiler
  * generated from TrashPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -199,6 +200,11 @@ typedef struct _TrashPageTrashSearchViewFilterClass TrashPageTrashSearchViewFilt
 
 typedef struct _MediaViewTracker MediaViewTracker;
 typedef struct _MediaViewTrackerClass MediaViewTrackerClass;
+enum  {
+	TRASH_PAGE_0_PROPERTY,
+	TRASH_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* trash_page_properties[TRASH_PAGE_NUM_PROPERTIES];
 #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
 #define _core_tracker_unref0(var) ((var == NULL) ? NULL : (var = (core_tracker_unref (var), NULL)))
 
@@ -432,6 +438,11 @@ typedef struct _Dimensions Dimensions;
 typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate;
 typedef struct _ThumbnailPrivate ThumbnailPrivate;
 typedef struct _TrashPageTrashViewPrivate TrashPageTrashViewPrivate;
+enum  {
+	TRASH_PAGE_TRASH_VIEW_0_PROPERTY,
+	TRASH_PAGE_TRASH_VIEW_NUM_PROPERTIES
+};
+static GParamSpec* trash_page_trash_view_properties[TRASH_PAGE_TRASH_VIEW_NUM_PROPERTIES];
 typedef struct _ViewFilterPrivate ViewFilterPrivate;
 typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate;
 typedef struct _DefaultSearchViewFilterPrivate DefaultSearchViewFilterPrivate;
@@ -723,9 +734,15 @@ 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 checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -739,17 +756,29 @@ 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;
@@ -758,33 +787,45 @@ GType default_search_view_filter_get_type (void) G_GNUC_CONST;
 static GType trash_page_trash_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType media_view_tracker_get_type (void) G_GNUC_CONST;
 #define TRASH_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_TRASH_PAGE, TrashPagePrivate))
-enum  {
-	TRASH_PAGE_DUMMY_PROPERTY
-};
 static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void);
 static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type);
 #define TRASH_PAGE_NAME _ ("Trash")
 static void trash_page_on_delete (TrashPage* self);
-static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action,
+                                                             GVariant* parameter,
+                                                             gpointer self);
 static void trash_page_on_restore (TrashPage* self);
-static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self);
 TrashPage* trash_page_new (void);
 TrashPage* trash_page_construct (GType object_type);
-CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
-void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path);
-void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path);
-void page_init_toolbar (Page* self, const gchar* path);
+CheckerboardPage* checkerboard_page_construct (GType object_type,
+                                               const gchar* page_name);
+void checkerboard_page_init_item_context_menu (CheckerboardPage* self,
+                                               const gchar* path);
+void checkerboard_page_init_page_context_menu (CheckerboardPage* self,
+                                               const gchar* path);
+void page_init_toolbar (Page* self,
+                        const gchar* path);
 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 view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 MediaViewTracker* media_view_tracker_new (ViewCollection* collection);
-MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection);
+MediaViewTracker* media_view_tracker_construct (GType object_type,
+                                                ViewCollection* collection);
 GType source_collection_get_type (void) G_GNUC_CONST;
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
@@ -792,74 +833,113 @@ GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
-static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed);
-static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void trash_page_on_trashcan_contents_altered (TrashPage* self,
+                                              GeeCollection* added,
+                                              GeeCollection* removed);
+static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                 GeeCollection* added,
+                                                                                                 GeeCollection* removed,
+                                                                                                 gpointer self);
 GType video_source_collection_get_type (void) G_GNUC_CONST;
 GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self);
-static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void trash_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void trash_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
+static void trash_page_real_init_collect_ui_filenames (Page* base,
+                                                GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void trash_page_real_add_actions (Page* base,
+                                  GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+static void trash_page_real_remove_actions (Page* base,
+                                     GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
 static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base);
-static void trash_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_set_common_action_important (Page* self, const gchar* name, gboolean important);
-void page_update_actions (Page* self, gint selected_count, gint count);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
+static void trash_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_set_common_action_important (Page* self,
+                                       const gchar* name,
+                                       gboolean important);
+void page_update_actions (Page* self,
+                          gint selected_count,
+                          gint count);
+gboolean data_collection_add (DataCollection* self,
+                              DataObject* object);
 static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source);
-static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source);
+static TrashPageTrashView* trash_page_trash_view_construct (GType object_type,
+                                                     MediaSource* source);
 GType media_source_item_get_type (void) G_GNUC_CONST;
 GType thumbnail_get_type (void) G_GNUC_CONST;
 static GType trash_page_trash_view_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType marker_get_type (void) G_GNUC_CONST;
 Marker* data_collection_start_marking (DataCollection* self);
-void marker_mark (Marker* self, DataObject* object);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
-void data_collection_remove_marked (DataCollection* self, Marker* m);
+void marker_mark (Marker* self,
+                  DataObject* object);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+                                               DataSource* source);
+void data_collection_remove_marked (DataCollection* self,
+                                    Marker* m);
 gint view_collection_get_selected_count (ViewCollection* self);
 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* page_get_command_manager (Page* self);
 GType command_get_type (void) G_GNUC_CONST;
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
 GeeList* view_collection_get_selected_sources (ViewCollection* self);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType library_photo_get_type (void) G_GNUC_CONST;
-TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources,
+                                                             gboolean to_trash);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type,
+                                                                   GeeCollection* sources,
+                                                                   gboolean to_trash);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
 static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base);
-void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text);
+void remove_from_app (GeeCollection* sources,
+                      const gchar* dialog_title,
+                      const gchar* progress_dialog_text);
 static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base);
 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;
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
-enum  {
-	TRASH_PAGE_TRASH_VIEW_DUMMY_PROPERTY
-};
 gint thumbnail_get_DEFAULT_SCALE (void);
-Thumbnail* thumbnail_new (MediaSource* media, gint scale);
-Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale);
+Thumbnail* thumbnail_new (MediaSource* media,
+                          gint scale);
+Thumbnail* thumbnail_construct (GType object_type,
+                                MediaSource* media,
+                                gint scale);
 gboolean media_source_is_trashed (MediaSource* self);
-enum  {
-	TRASH_PAGE_TRASH_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
 static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
@@ -867,28 +947,43 @@ static void trash_page_finalize (GObject * obj);
 
 static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_delete_gsimple_action_activate_callback}, {"Restore", _trash_page_on_restore_gsimple_action_activate_callback}};
 
-static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action,
+                                                        GVariant* parameter,
+                                                        gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_on_delete ((TrashPage*) self);
-#line 874 "TrashPage.c"
+#line 958 "TrashPage.c"
 }
 
 
-static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action,
+                                                         GVariant* parameter,
+                                                         gpointer self)
+{
 #line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_on_restore ((TrashPage*) self);
-#line 881 "TrashPage.c"
+#line 969 "TrashPage.c"
 }
 
 
-static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                            GeeCollection* added,
+                                                                                            GeeCollection* removed,
+                                                                                            gpointer self)
+{
 #line 38 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_on_trashcan_contents_altered ((TrashPage*) self, added, removed);
-#line 888 "TrashPage.c"
+#line 981 "TrashPage.c"
 }
 
 
-TrashPage* trash_page_construct (GType object_type) {
+TrashPage*
+trash_page_construct (GType object_type)
+{
 	TrashPage * self = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -951,69 +1046,65 @@ TrashPage* trash_page_construct (GType object_type) {
 	_g_object_unref0 (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 955 "TrashPage.c"
+#line 1050 "TrashPage.c"
 }
 
 
-TrashPage* trash_page_new (void) {
+TrashPage*
+trash_page_new (void)
+{
 #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_construct (TYPE_TRASH_PAGE);
-#line 962 "TrashPage.c"
+#line 1059 "TrashPage.c"
 }
 
 
-static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+trash_page_real_init_collect_ui_filenames (Page* base,
+                                           GeeList* ui_filenames)
+{
 	TrashPage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 44 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 45 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp0_ = ui_filenames;
-#line 45 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	PAGE_CLASS (trash_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp1_ = ui_filenames;
+	PAGE_CLASS (trash_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames);
 #line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui");
-#line 982 "TrashPage.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui");
+#line 1076 "TrashPage.c"
 }
 
 
-static void trash_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+trash_page_real_add_actions (Page* base,
+                             GActionMap* map)
+{
 	TrashPage * self;
-	GActionMap* _tmp0_;
-	GActionMap* _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp0_ = map;
-#line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp1_ = map;
+	PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
 #line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	g_action_map_add_action_entries (_tmp1_, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
-#line 1002 "TrashPage.c"
+	g_action_map_add_action_entries (map, TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
+#line 1093 "TrashPage.c"
 }
 
 
-static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+trash_page_real_remove_actions (Page* base,
+                                GActionMap* map)
+{
 	TrashPage * self;
-	GActionMap* _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp0_ = map;
-#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 1017 "TrashPage.c"
+	PAGE_CLASS (trash_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
+#line 1108 "TrashPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1025,38 +1116,39 @@ static void trash_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (TRASH_PAGE_entries);
 #line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (TRASH_PAGE_entries); entry_it = entry_it + 1) {
-#line 1029 "TrashPage.c"
+#line 1120 "TrashPage.c"
 			GActionEntry entry = {0};
 #line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			entry = entry_collection[entry_it];
-#line 1033 "TrashPage.c"
+#line 1124 "TrashPage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp1_ = map;
+				_tmp0_ = entry;
 #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp2_ = entry;
+				_tmp1_ = _tmp0_.name;
 #line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp3_ = _tmp2_.name;
-#line 64 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1046 "TrashPage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 1134 "TrashPage.c"
 			}
 		}
 	}
 }
 
 
-static gpointer _core_tracker_ref0 (gpointer self) {
+static gpointer
+_core_tracker_ref0 (gpointer self)
+{
 #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 1056 "TrashPage.c"
+#line 1146 "TrashPage.c"
 }
 
 
-static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base) {
+static CoreViewTracker*
+trash_page_real_get_view_tracker (CheckerboardPage* base)
+{
 	TrashPage * self;
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_;
@@ -1071,22 +1163,21 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base
 	result = _tmp1_;
 #line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1075 "TrashPage.c"
+#line 1167 "TrashPage.c"
 }
 
 
-static void trash_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+trash_page_real_update_actions (Page* base,
+                                gint selected_count,
+                                gint count)
+{
 	TrashPage * self;
 	gboolean has_selected = FALSE;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp0_ = selected_count;
-#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	has_selected = _tmp0_ > 0;
+	has_selected = selected_count > 0;
 #line 75 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", has_selected);
 #line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1094,18 +1185,16 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin
 #line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE);
 #line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp1_ = selected_count;
-#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_ = count;
-#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 1103 "TrashPage.c"
+	PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count);
+#line 1190 "TrashPage.c"
 }
 
 
-static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_;
-	GeeCollection* _tmp12_;
+static void
+trash_page_on_trashcan_contents_altered (TrashPage* self,
+                                         GeeCollection* added,
+                                         GeeCollection* removed)
+{
 #line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
 #line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1113,196 +1202,181 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 #line 82 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp0_ = added;
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	if (_tmp0_ != NULL) {
-#line 1120 "TrashPage.c"
+	if (added != NULL) {
+#line 1207 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_;
-			GeeIterator* _tmp2_;
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-			_tmp1_ = added;
+			GeeIterator* _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable));
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-			_source_it = _tmp2_;
+			_source_it = _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1133 "TrashPage.c"
-				GeeIterator* _tmp3_;
-				gboolean _tmp4_;
+#line 1217 "TrashPage.c"
+				GeeIterator* _tmp1_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp5_;
-				gpointer _tmp6_;
-				ViewCollection* _tmp7_;
-				ViewCollection* _tmp8_;
-				MediaSource* _tmp9_;
-				TrashPageTrashView* _tmp10_;
-				TrashPageTrashView* _tmp11_;
+				GeeIterator* _tmp2_;
+				gpointer _tmp3_;
+				ViewCollection* _tmp4_;
+				ViewCollection* _tmp5_;
+				MediaSource* _tmp6_;
+				TrashPageTrashView* _tmp7_;
+				TrashPageTrashView* _tmp8_;
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp3_ = _source_it;
+				_tmp1_ = _source_it;
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				if (!_tmp4_) {
+				if (!gee_iterator_next (_tmp1_)) {
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1152 "TrashPage.c"
+#line 1233 "TrashPage.c"
 				}
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp5_ = _source_it;
+				_tmp2_ = _source_it;
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp6_ = gee_iterator_get (_tmp5_);
+				_tmp3_ = gee_iterator_get (_tmp2_);
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				source = (MediaSource*) _tmp6_;
+				source = (MediaSource*) _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp8_ = _tmp7_;
+				_tmp5_ = _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp9_ = source;
+				_tmp6_ = source;
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp10_ = trash_page_trash_view_new (_tmp9_);
+				_tmp7_ = trash_page_trash_view_new (_tmp6_);
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp11_ = _tmp10_;
+				_tmp8_ = _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
+				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_g_object_unref0 (_tmp11_);
+				_g_object_unref0 (_tmp8_);
 #line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_data_collection_unref0 (_tmp8_);
+				_data_collection_unref0 (_tmp5_);
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1178 "TrashPage.c"
+#line 1259 "TrashPage.c"
 			}
 #line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1182 "TrashPage.c"
+#line 1263 "TrashPage.c"
 		}
 	}
 #line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp12_ = removed;
-#line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	if (_tmp12_ != NULL) {
-#line 1189 "TrashPage.c"
+	if (removed != NULL) {
+#line 1268 "TrashPage.c"
 		Marker* marker = NULL;
-		ViewCollection* _tmp13_;
-		ViewCollection* _tmp14_;
-		Marker* _tmp15_;
-		Marker* _tmp16_;
-		ViewCollection* _tmp29_;
-		ViewCollection* _tmp30_;
-		Marker* _tmp31_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		Marker* _tmp11_;
+		Marker* _tmp12_;
+		ViewCollection* _tmp23_;
+		ViewCollection* _tmp24_;
+		Marker* _tmp25_;
 #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp10_ = _tmp9_;
 #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
+		_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
 #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp12_ = _tmp11_;
 #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_data_collection_unref0 (_tmp14_);
+		_data_collection_unref0 (_tmp10_);
 #line 90 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		marker = _tmp16_;
-#line 1210 "TrashPage.c"
+		marker = _tmp12_;
+#line 1289 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp17_;
-			GeeIterator* _tmp18_;
+			GeeIterator* _tmp13_;
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-			_tmp17_ = removed;
+			_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable));
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-			_source_it = _tmp18_;
+			_source_it = _tmp13_;
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1223 "TrashPage.c"
-				GeeIterator* _tmp19_;
-				gboolean _tmp20_;
+#line 1299 "TrashPage.c"
+				GeeIterator* _tmp14_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp21_;
-				gpointer _tmp22_;
-				Marker* _tmp23_;
-				ViewCollection* _tmp24_;
-				ViewCollection* _tmp25_;
-				MediaSource* _tmp26_;
-				DataView* _tmp27_;
-				DataView* _tmp28_;
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp19_ = _source_it;
+				GeeIterator* _tmp15_;
+				gpointer _tmp16_;
+				Marker* _tmp17_;
+				ViewCollection* _tmp18_;
+				ViewCollection* _tmp19_;
+				MediaSource* _tmp20_;
+				DataView* _tmp21_;
+				DataView* _tmp22_;
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp20_ = gee_iterator_next (_tmp19_);
+				_tmp14_ = _source_it;
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				if (!_tmp20_) {
+				if (!gee_iterator_next (_tmp14_)) {
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1243 "TrashPage.c"
+#line 1316 "TrashPage.c"
 				}
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp21_ = _source_it;
+				_tmp15_ = _source_it;
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp22_ = gee_iterator_get (_tmp21_);
+				_tmp16_ = gee_iterator_get (_tmp15_);
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				source = (MediaSource*) _tmp22_;
+				source = (MediaSource*) _tmp16_;
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp23_ = marker;
+				_tmp17_ = marker;
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp25_ = _tmp24_;
+				_tmp19_ = _tmp18_;
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp26_ = source;
+				_tmp20_ = source;
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
+				_tmp21_ = view_collection_get_view_for_source (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_SOURCE, DataSource));
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_tmp28_ = _tmp27_;
+				_tmp22_ = _tmp21_;
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
+				marker_mark (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_g_object_unref0 (_tmp28_);
+				_g_object_unref0 (_tmp22_);
 #line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-				_data_collection_unref0 (_tmp25_);
+				_data_collection_unref0 (_tmp19_);
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1271 "TrashPage.c"
+#line 1344 "TrashPage.c"
 			}
 #line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1275 "TrashPage.c"
+#line 1348 "TrashPage.c"
 		}
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp30_ = _tmp29_;
+		_tmp24_ = _tmp23_;
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_tmp31_ = marker;
+		_tmp25_ = marker;
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
+		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_);
 #line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		_data_collection_unref0 (_tmp30_);
+		_data_collection_unref0 (_tmp24_);
 #line 89 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_g_object_unref0 (marker);
-#line 1289 "TrashPage.c"
+#line 1362 "TrashPage.c"
 	}
 }
 
 
-static void trash_page_on_restore (TrashPage* self) {
+static void
+trash_page_on_restore (TrashPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
+	CommandManager* _tmp3_;
 	CommandManager* _tmp4_;
-	CommandManager* _tmp5_;
+	ViewCollection* _tmp5_;
 	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	GeeList* _tmp8_;
-	GeeCollection* _tmp9_;
+	GeeList* _tmp7_;
+	GeeCollection* _tmp8_;
+	TrashUntrashPhotosCommand* _tmp9_;
 	TrashUntrashPhotosCommand* _tmp10_;
-	TrashUntrashPhotosCommand* _tmp11_;
 #line 97 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
 #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1310,48 +1384,48 @@ static void trash_page_on_restore (TrashPage* self) {
 #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _tmp0_;
 #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 98 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		return;
-#line 1323 "TrashPage.c"
+#line 1395 "TrashPage.c"
 	}
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
+	_tmp7_ = view_collection_get_selected_sources (_tmp6_);
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE);
+	_tmp9_ = trash_untrash_photos_command_new (_tmp8_, FALSE);
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_g_object_unref0 (_tmp11_);
+	_g_object_unref0 (_tmp10_);
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_data_collection_unref0 (_tmp7_);
+	_data_collection_unref0 (_tmp6_);
 #line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_command_manager_unref0 (_tmp5_);
-#line 1351 "TrashPage.c"
+	_command_manager_unref0 (_tmp4_);
+#line 1423 "TrashPage.c"
 }
 
 
-static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
+static gchar*
+trash_page_real_get_view_empty_message (CheckerboardPage* base)
+{
 	TrashPage * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -1363,20 +1437,21 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
 	result = _tmp0_;
 #line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1367 "TrashPage.c"
+#line 1441 "TrashPage.c"
 }
 
 
-static void trash_page_on_delete (TrashPage* self) {
+static void
+trash_page_on_delete (TrashPage* self)
+{
 	const gchar* _tmp0_ = NULL;
 	ViewCollection* _tmp1_;
 	ViewCollection* _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp3_;
+	ViewCollection* _tmp4_;
 	ViewCollection* _tmp5_;
-	ViewCollection* _tmp6_;
-	GeeList* _tmp7_;
-	GeeCollection* _tmp8_;
+	GeeList* _tmp6_;
+	GeeCollection* _tmp7_;
 #line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1384,47 +1459,49 @@ static void trash_page_on_delete (TrashPage* self) {
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = _tmp1_;
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp4_ = _tmp3_ == 1;
+	_tmp3_ = view_collection_get_selected_count (_tmp2_) == 1;
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp2_);
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	if (_tmp4_) {
+	if (_tmp3_) {
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = "Deleting a Photo";
-#line 1397 "TrashPage.c"
+#line 1470 "TrashPage.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = _ ("Deleting Photos");
-#line 1401 "TrashPage.c"
+#line 1474 "TrashPage.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp7_ = view_collection_get_selected_sources (_tmp6_);
+	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
 #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	remove_from_app (_tmp8_, _ ("Delete"), _tmp0_);
+	remove_from_app (_tmp7_, _ ("Delete"), _tmp0_);
 #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_data_collection_unref0 (_tmp6_);
-#line 1417 "TrashPage.c"
+	_data_collection_unref0 (_tmp5_);
+#line 1490 "TrashPage.c"
 }
 
 
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
 #line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1424 "TrashPage.c"
+#line 1499 "TrashPage.c"
 }
 
 
-static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+trash_page_real_get_search_view_filter (CheckerboardPage* base)
+{
 	TrashPage * self;
 	SearchViewFilter* result = NULL;
 	TrashPageTrashSearchViewFilter* _tmp0_;
@@ -1439,58 +1516,60 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag
 	result = _tmp1_;
 #line 115 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1443 "TrashPage.c"
+#line 1520 "TrashPage.c"
 }
 
 
-static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, MediaSource* source) {
+static TrashPageTrashView*
+trash_page_trash_view_construct (GType object_type,
+                                 MediaSource* source)
+{
 	TrashPageTrashView * self = NULL;
-	MediaSource* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	gint _tmp2_;
-	MediaSource* _tmp3_;
-	gboolean _tmp4_;
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp0_ = source;
-#line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp1_ = thumbnail_get_DEFAULT_SCALE ();
+	_tmp0_ = thumbnail_get_DEFAULT_SCALE ();
 #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	self = (TrashPageTrashView*) thumbnail_construct (object_type, _tmp0_, _tmp2_);
+	self = (TrashPageTrashView*) thumbnail_construct (object_type, source, _tmp1_);
 #line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp3_ = source;
-#line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp4_ = media_source_is_trashed (_tmp3_);
-#line 14 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_vala_assert (_tmp4_, "source.is_trashed()");
+	_vala_assert (media_source_is_trashed (source), "source.is_trashed()");
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1472 "TrashPage.c"
+#line 1543 "TrashPage.c"
 }
 
 
-static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) {
+static TrashPageTrashView*
+trash_page_trash_view_new (MediaSource* source)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source);
-#line 1479 "TrashPage.c"
+#line 1552 "TrashPage.c"
 }
 
 
-static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) {
+static void
+trash_page_trash_view_class_init (TrashPageTrashViewClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_trash_view_parent_class = g_type_class_peek_parent (klass);
-#line 1486 "TrashPage.c"
+#line 1561 "TrashPage.c"
 }
 
 
-static void trash_page_trash_view_instance_init (TrashPageTrashView * self) {
+static void
+trash_page_trash_view_instance_init (TrashPageTrashView * self)
+{
 }
 
 
-static GType trash_page_trash_view_get_type (void) {
+static GType
+trash_page_trash_view_get_type (void)
+{
 	static volatile gsize trash_page_trash_view_type_id__volatile = 0;
 	if (g_once_init_enter (&trash_page_trash_view_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (TrashPageTrashViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_trash_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPageTrashView), 0, (GInstanceInitFunc) trash_page_trash_view_instance_init, NULL };
@@ -1502,7 +1581,9 @@ static GType trash_page_trash_view_get_type (void) {
 }
 
 
-static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+trash_page_trash_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
 	TrashPageTrashSearchViewFilter * self;
 	guint result = 0U;
 #line 19 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1511,41 +1592,51 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1515 "TrashPage.c"
+#line 1596 "TrashPage.c"
 }
 
 
-static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type) {
+static TrashPageTrashSearchViewFilter*
+trash_page_trash_search_view_filter_construct (GType object_type)
+{
 	TrashPageTrashSearchViewFilter* self = NULL;
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1525 "TrashPage.c"
+#line 1608 "TrashPage.c"
 }
 
 
-static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) {
+static TrashPageTrashSearchViewFilter*
+trash_page_trash_search_view_filter_new (void)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER);
-#line 1532 "TrashPage.c"
+#line 1617 "TrashPage.c"
 }
 
 
-static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearchViewFilterClass * klass) {
+static void
+trash_page_trash_search_view_filter_class_init (TrashPageTrashSearchViewFilterClass * klass)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) trash_page_trash_search_view_filter_real_get_criteria;
-#line 1541 "TrashPage.c"
+#line 1628 "TrashPage.c"
 }
 
 
-static void trash_page_trash_search_view_filter_instance_init (TrashPageTrashSearchViewFilter * self) {
+static void
+trash_page_trash_search_view_filter_instance_init (TrashPageTrashSearchViewFilter * self)
+{
 }
 
 
-static GType trash_page_trash_search_view_filter_get_type (void) {
+static GType
+trash_page_trash_search_view_filter_get_type (void)
+{
 	static volatile gsize trash_page_trash_search_view_filter_type_id__volatile = 0;
 	if (g_once_init_enter (&trash_page_trash_search_view_filter_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (TrashPageTrashSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_trash_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPageTrashSearchViewFilter), 0, (GInstanceInitFunc) trash_page_trash_search_view_filter_instance_init, NULL };
@@ -1557,7 +1648,9 @@ static GType trash_page_trash_search_view_filter_get_type (void) {
 }
 
 
-static void trash_page_class_init (TrashPageClass * klass) {
+static void
+trash_page_class_init (TrashPageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1578,11 +1671,13 @@ static void trash_page_class_init (TrashPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) trash_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_page_finalize;
-#line 1582 "TrashPage.c"
+#line 1675 "TrashPage.c"
 }
 
 
-static void trash_page_instance_init (TrashPage * self) {
+static void
+trash_page_instance_init (TrashPage * self)
+{
 	TrashPageTrashSearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self->priv = TRASH_PAGE_GET_PRIVATE (self);
@@ -1590,11 +1685,13 @@ static void trash_page_instance_init (TrashPage * self) {
 	_tmp0_ = trash_page_trash_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1594 "TrashPage.c"
+#line 1689 "TrashPage.c"
 }
 
 
-static void trash_page_finalize (GObject * obj) {
+static void
+trash_page_finalize (GObject * obj)
+{
 	TrashPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TRASH_PAGE, TrashPage);
@@ -1604,11 +1701,13 @@ static void trash_page_finalize (GObject * obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj);
-#line 1608 "TrashPage.c"
+#line 1705 "TrashPage.c"
 }
 
 
-GType trash_page_get_type (void) {
+GType
+trash_page_get_type (void)
+{
 	static volatile gsize trash_page_type_id__volatile = 0;
 	if (g_once_init_enter (&trash_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (TrashPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) trash_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (TrashPage), 0, (GInstanceInitFunc) trash_page_instance_init, NULL };
diff --git a/src/library/TrashSidebarEntry.c b/src/library/TrashSidebarEntry.c
index 9b8a030..796281b 100644
--- a/src/library/TrashSidebarEntry.c
+++ b/src/library/TrashSidebarEntry.c
@@ -1,4 +1,4 @@
-/* TrashSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* TrashSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from TrashSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -138,6 +139,11 @@ typedef struct _MediaSourceClass MediaSourceClass;
 typedef struct _LibraryTrashSidebarEntry LibraryTrashSidebarEntry;
 typedef struct _LibraryTrashSidebarEntryClass LibraryTrashSidebarEntryClass;
 typedef struct _LibraryTrashSidebarEntryPrivate LibraryTrashSidebarEntryPrivate;
+enum  {
+	LIBRARY_TRASH_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_TRASH_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_trash_sidebar_entry_properties[LIBRARY_TRASH_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -325,14 +331,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST;
 GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_TRASH_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 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;
@@ -340,15 +349,24 @@ 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);
 GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
 static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self);
-static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                                  GeeCollection* added,
+                                                                                                                  GeeCollection* removed,
+                                                                                                                  gpointer self);
 LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void);
 LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type);
 SidebarSimplePageEntry* sidebar_simple_page_entry_construct (GType object_type);
@@ -361,22 +379,34 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void);
 gint media_source_collection_get_trashcan_count (MediaSourceCollection* self);
 #define RESOURCES_ICON_TRASH_FULL "user-trash-full"
 #define RESOURCES_ICON_TRASH_EMPTY "user-trash"
-static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media);
+static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+                                                                  GeeList* media);
 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);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources,
+                                                             gboolean to_trash);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type,
+                                                                   GeeCollection* sources,
+                                                                   gboolean to_trash);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
-static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data);
+static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+                                                                            GtkSelectionData* data);
 static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
 TrashPage* trash_page_new (void);
 TrashPage* trash_page_construct (GType object_type);
@@ -385,18 +415,25 @@ GType trash_page_get_type (void) G_GNUC_CONST;
 static void library_trash_sidebar_entry_finalize (GObject * obj);
 
 
-static void _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender,
+                                                                                                             GeeCollection* added,
+                                                                                                             GeeCollection* removed,
+                                                                                                             gpointer self)
+{
 #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	library_trash_sidebar_entry_on_trashcan_contents_altered ((LibraryTrashSidebarEntry*) self);
-#line 392 "TrashSidebarEntry.c"
+#line 427 "TrashSidebarEntry.c"
 }
 
 
-LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_type) {
+LibraryTrashSidebarEntry*
+library_trash_sidebar_entry_construct (GType object_type)
+{
 	LibraryTrashSidebarEntry * self = NULL;
 #line 9 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = (LibraryTrashSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 400 "TrashSidebarEntry.c"
+#line 437 "TrashSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -425,63 +462,68 @@ LibraryTrashSidebarEntry* library_trash_sidebar_entry_construct (GType object_ty
 		_media_sources_it = _tmp5_;
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		while (TRUE) {
-#line 429 "TrashSidebarEntry.c"
+#line 466 "TrashSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 				break;
-#line 444 "TrashSidebarEntry.c"
+#line 478 "TrashSidebarEntry.c"
 			}
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 11 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 11 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			g_signal_connect_object (_tmp10_, "trashcan-contents-altered", (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "trashcan-contents-altered", (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 458 "TrashSidebarEntry.c"
+#line 492 "TrashSidebarEntry.c"
 		}
 #line 10 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 462 "TrashSidebarEntry.c"
+#line 496 "TrashSidebarEntry.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return self;
-#line 466 "TrashSidebarEntry.c"
+#line 500 "TrashSidebarEntry.c"
 }
 
 
-LibraryTrashSidebarEntry* library_trash_sidebar_entry_new (void) {
+LibraryTrashSidebarEntry*
+library_trash_sidebar_entry_new (void)
+{
 #line 9 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return library_trash_sidebar_entry_construct (LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY);
-#line 473 "TrashSidebarEntry.c"
+#line 509 "TrashSidebarEntry.c"
 }
 
 
-void library_trash_sidebar_entry_init (void) {
+void
+library_trash_sidebar_entry_init (void)
+{
 }
 
 
-void library_trash_sidebar_entry_terminate (void) {
+void
+library_trash_sidebar_entry_terminate (void)
+{
 }
 
 
-static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryTrashSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -493,11 +535,13 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_name (SidebarSimplePa
 	result = _tmp0_;
 #line 26 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return result;
-#line 497 "TrashSidebarEntry.c"
+#line 539 "TrashSidebarEntry.c"
 }
 
 
-static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryTrashSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -509,13 +553,15 @@ static gchar* library_trash_sidebar_entry_real_get_sidebar_icon (SidebarSimplePa
 	result = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return result;
-#line 513 "TrashSidebarEntry.c"
+#line 557 "TrashSidebarEntry.c"
 }
 
 
-static gchar* library_trash_sidebar_entry_get_current_icon (void) {
+static gchar*
+library_trash_sidebar_entry_get_current_icon (void)
+{
 	gchar* result = NULL;
-	gchar* _tmp13_;
+	gchar* _tmp11_;
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -544,76 +590,72 @@ static gchar* library_trash_sidebar_entry_get_current_icon (void) {
 		_media_sources_it = _tmp5_;
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		while (TRUE) {
-#line 548 "TrashSidebarEntry.c"
+#line 594 "TrashSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			gint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 				break;
-#line 564 "TrashSidebarEntry.c"
+#line 606 "TrashSidebarEntry.c"
 			}
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
-#line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp11_ = media_source_collection_get_trashcan_count (_tmp10_);
+			_tmp9_ = media_sources;
 #line 35 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			if (_tmp11_ > 0) {
-#line 578 "TrashSidebarEntry.c"
-				gchar* _tmp12_;
+			if (media_source_collection_get_trashcan_count (_tmp9_) > 0) {
+#line 618 "TrashSidebarEntry.c"
+				gchar* _tmp10_;
 #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-				_tmp12_ = g_strdup (RESOURCES_ICON_TRASH_FULL);
+				_tmp10_ = g_strdup (RESOURCES_ICON_TRASH_FULL);
 #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-				result = _tmp12_;
+				result = _tmp10_;
 #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 				_data_collection_unref0 (media_sources);
 #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 				_g_object_unref0 (_media_sources_it);
 #line 36 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 				return result;
-#line 590 "TrashSidebarEntry.c"
+#line 630 "TrashSidebarEntry.c"
 			}
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 594 "TrashSidebarEntry.c"
+#line 634 "TrashSidebarEntry.c"
 		}
 #line 34 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 598 "TrashSidebarEntry.c"
+#line 638 "TrashSidebarEntry.c"
 	}
 #line 39 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	_tmp13_ = g_strdup (RESOURCES_ICON_TRASH_EMPTY);
+	_tmp11_ = g_strdup (RESOURCES_ICON_TRASH_EMPTY);
 #line 39 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	result = _tmp13_;
+	result = _tmp11_;
 #line 39 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return result;
-#line 606 "TrashSidebarEntry.c"
+#line 646 "TrashSidebarEntry.c"
 }
 
 
-static gboolean library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
+static gboolean
+library_trash_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+                                                         GeeList* media)
+{
 	LibraryTrashSidebarEntry * self;
 	gboolean result = FALSE;
 	CommandManager* _tmp0_;
 	CommandManager* _tmp1_;
-	GeeList* _tmp2_;
+	TrashUntrashPhotosCommand* _tmp2_;
 	TrashUntrashPhotosCommand* _tmp3_;
-	TrashUntrashPhotosCommand* _tmp4_;
 #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
 #line 42 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -623,26 +665,27 @@ static gboolean library_trash_sidebar_entry_real_internal_drop_received (Sidebar
 #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	_tmp1_ = _tmp0_;
 #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	_tmp2_ = media;
+	_tmp2_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
 #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	_tmp3_ = trash_untrash_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
+	_tmp3_ = _tmp2_;
 #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	_tmp4_ = _tmp3_;
+	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_COMMAND, Command));
 #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_COMMAND, Command));
-#line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 43 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	_command_manager_unref0 (_tmp1_);
 #line 45 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	result = TRUE;
 #line 45 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return result;
-#line 642 "TrashSidebarEntry.c"
+#line 682 "TrashSidebarEntry.c"
 }
 
 
-static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) {
+static gboolean
+library_trash_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+                                                                   GtkSelectionData* data)
+{
 	LibraryTrashSidebarEntry * self;
 	gboolean result = FALSE;
 #line 48 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -653,11 +696,13 @@ static gboolean library_trash_sidebar_entry_real_internal_drop_received_arbitrar
 	result = FALSE;
 #line 49 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return result;
-#line 657 "TrashSidebarEntry.c"
+#line 700 "TrashSidebarEntry.c"
 }
 
 
-static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryTrashSidebarEntry * self;
 	Page* result = NULL;
 	TrashPage* _tmp0_;
@@ -671,11 +716,13 @@ static Page* library_trash_sidebar_entry_real_create_page (SidebarSimplePageEntr
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 53 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	return result;
-#line 675 "TrashSidebarEntry.c"
+#line 720 "TrashSidebarEntry.c"
 }
 
 
-static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self) {
+static void
+library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTrashSidebarEntry* self)
+{
 	gchar* _tmp0_;
 	gchar* _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -688,11 +735,13 @@ static void library_trash_sidebar_entry_on_trashcan_contents_altered (LibraryTra
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp1_);
 #line 57 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	_g_free0 (_tmp1_);
-#line 692 "TrashSidebarEntry.c"
+#line 739 "TrashSidebarEntry.c"
 }
 
 
-static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClass * klass) {
+static void
+library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	library_trash_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
@@ -703,30 +752,36 @@ static void library_trash_sidebar_entry_class_init (LibraryTrashSidebarEntryClas
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_trash_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_trash_sidebar_entry_finalize;
-#line 707 "TrashSidebarEntry.c"
+#line 756 "TrashSidebarEntry.c"
 }
 
 
-static void library_trash_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
+static void
+library_trash_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	library_trash_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_trash_sidebar_entry_real_internal_drop_received;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_trash_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 718 "TrashSidebarEntry.c"
+#line 769 "TrashSidebarEntry.c"
 }
 
 
-static void library_trash_sidebar_entry_instance_init (LibraryTrashSidebarEntry * self) {
+static void
+library_trash_sidebar_entry_instance_init (LibraryTrashSidebarEntry * self)
+{
 }
 
 
-static void library_trash_sidebar_entry_finalize (GObject * obj) {
+static void
+library_trash_sidebar_entry_finalize (GObject * obj)
+{
 	LibraryTrashSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, LibraryTrashSidebarEntry);
-#line 730 "TrashSidebarEntry.c"
+#line 785 "TrashSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -755,51 +810,50 @@ static void library_trash_sidebar_entry_finalize (GObject * obj) {
 		_media_sources_it = _tmp5_;
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		while (TRUE) {
-#line 759 "TrashSidebarEntry.c"
+#line 814 "TrashSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			guint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
+			guint _tmp10_;
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 				break;
-#line 775 "TrashSidebarEntry.c"
+#line 827 "TrashSidebarEntry.c"
 			}
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 16 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_trash_sidebar_entry_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 791 "TrashSidebarEntry.c"
+#line 843 "TrashSidebarEntry.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 795 "TrashSidebarEntry.c"
+#line 847 "TrashSidebarEntry.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/library/TrashSidebarEntry.vala"
 	G_OBJECT_CLASS (library_trash_sidebar_entry_parent_class)->finalize (obj);
-#line 799 "TrashSidebarEntry.c"
+#line 851 "TrashSidebarEntry.c"
 }
 
 
-GType library_trash_sidebar_entry_get_type (void) {
+GType
+library_trash_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_trash_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_trash_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryTrashSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_trash_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryTrashSidebarEntry), 0, (GInstanceInitFunc) library_trash_sidebar_entry_instance_init, NULL };
-- 
cgit v1.2.3