Update upstream source from tag 'upstream/0.28.2'

Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965

6 files changed, 3740 insertions, 3688 deletions

diff --git a/src/library/Branch.c b/src/library/LibraryBranch.c
index 92955e2..1cd27cb 100644
--- a/src/library/Branch.c
+++ b/src/library/LibraryBranch.c
@@ -1,5 +1,5 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
- * generated from Branch.vala, do not modify */
+/* LibraryBranch.c generated by valac 0.36.6, the Vala compiler
+ * generated from LibraryBranch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
  *
@@ -802,8 +802,8 @@ static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_U
 #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);
+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;
@@ -994,37 +994,37 @@ static GType library_branch_entry_position_get_type (void) {
 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"
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1000 "Branch.c"
+#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/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
-#line 1007 "Branch.c"
+#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/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
-#line 1014 "Branch.c"
+#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/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
-#line 1021 "Branch.c"
+#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/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
-#line 1028 "Branch.c"
+#line 1028 "LibraryBranch.c"
 }
 
 
@@ -1050,104 +1050,104 @@ LibraryBranch* library_branch_construct (GType object_type) {
 	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"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = library_photos_entry_new ();
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 33 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp4_ = library_trash_sidebar_entry_new ();
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp5_ = _tmp4_;
-#line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp5_);
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp7_ = _tmp6_;
-#line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp7_);
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp8_ = library_flagged_sidebar_entry_new ();
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp9_ = _tmp8_;
-#line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp9_);
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp10_ = library_offline_sidebar_entry_new ();
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp11_ = _tmp10_;
-#line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 37 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp11_);
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp13_ = _tmp12_;
-#line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp13_);
-#line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 40 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp14_ = self->priv->_photos_entry;
-#line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp15_ = self->priv->_trash_entry;
-#line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 43 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp16_ = self->priv->_flagged_entry;
-#line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 46 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp17_ = self->priv->_last_imported_entry;
-#line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 49 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp18_ = self->priv->_import_queue_entry;
-#line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp19_ = self->priv->_offline_entry;
-#line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1144 "Branch.c"
+#line 1144 "LibraryBranch.c"
 }
 
 
 LibraryBranch* library_branch_new (void) {
-#line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 29 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_branch_construct (LIBRARY_TYPE_BRANCH);
-#line 1151 "Branch.c"
+#line 1151 "LibraryBranch.c"
 }
 
 
@@ -1157,75 +1157,75 @@ static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gin
 	SidebarEntry* _tmp2_;
 	SidebarEntry* _tmp3_;
 	SidebarEntry* _tmp4_;
-#line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = entry;
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = position;
-#line 57 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = _tmp2_;
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp4_ = entry;
-#line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1181 "Branch.c"
+#line 1181 "LibraryBranch.c"
 }
 
 
 static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
 	LibraryFlaggedSidebarEntry* _tmp0_;
-#line 61 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_flagged_entry;
-#line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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 "Branch.c"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_last_imported_entry;
-#line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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 "Branch.c"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 70 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_import_queue_entry;
-#line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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 "Branch.c"
+#line 1217 "LibraryBranch.c"
 }
 
 
 static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
 	LibraryOfflineSidebarEntry* _tmp0_;
-#line 73 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_offline_entry;
-#line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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 "Branch.c"
+#line 1229 "LibraryBranch.c"
 }
 
 
@@ -1233,54 +1233,54 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 	LibraryHideablePageEntry* _tmp0_;
 	gboolean _tmp1_;
 	gboolean _tmp2_;
-#line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = entry;
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (_tmp2_) {
-#line 1249 "Branch.c"
+#line 1249 "LibraryBranch.c"
 		LibraryHideablePageEntry* _tmp3_;
 		gboolean _tmp4_;
-#line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp3_ = entry;
-#line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		if (!_tmp4_) {
-#line 1258 "Branch.c"
+#line 1258 "LibraryBranch.c"
 			LibraryHideablePageEntry* _tmp5_;
 			gint _tmp6_;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp5_ = entry;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp6_ = position;
-#line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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 "Branch.c"
+#line 1267 "LibraryBranch.c"
 		}
 	} else {
 		LibraryHideablePageEntry* _tmp7_;
 		gboolean _tmp8_;
-#line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp7_ = entry;
-#line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		if (_tmp8_) {
-#line 1278 "Branch.c"
+#line 1278 "LibraryBranch.c"
 			LibraryHideablePageEntry* _tmp9_;
-#line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp9_ = entry;
-#line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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 "Branch.c"
+#line 1284 "LibraryBranch.c"
 		}
 	}
 }
@@ -1292,67 +1292,67 @@ static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gconstpointer _tmp1_;
 	SidebarEntry* _tmp2_;
 	gconstpointer _tmp3_;
-#line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = a;
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = b;
-#line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1312 "Branch.c"
+#line 1312 "LibraryBranch.c"
 }
 
 
 LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	LibraryPhotosEntry* result;
 	LibraryPhotosEntry* _tmp0_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_photos_entry;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1327 "Branch.c"
+#line 1327 "LibraryBranch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1334 "Branch.c"
+#line 1334 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) {
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_photos_entry (self) != value) {
-#line 1343 "Branch.c"
+#line 1343 "LibraryBranch.c"
 		LibraryPhotosEntry* _tmp0_;
 		LibraryPhotosEntry* _tmp1_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_photos_entry = _tmp1_;
-#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 10 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "photos-entry");
-#line 1356 "Branch.c"
+#line 1356 "LibraryBranch.c"
 	}
 }
 
@@ -1360,37 +1360,37 @@ static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosE
 LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) {
 	LibraryFlaggedSidebarEntry* result;
 	LibraryFlaggedSidebarEntry* _tmp0_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_flagged_entry;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1372 "Branch.c"
+#line 1372 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) {
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_flagged_entry (self) != value) {
-#line 1381 "Branch.c"
+#line 1381 "LibraryBranch.c"
 		LibraryFlaggedSidebarEntry* _tmp0_;
 		LibraryFlaggedSidebarEntry* _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_flagged_entry = _tmp1_;
-#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 11 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "flagged-entry");
-#line 1394 "Branch.c"
+#line 1394 "LibraryBranch.c"
 	}
 }
 
@@ -1398,37 +1398,37 @@ static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlagge
 LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) {
 	LibraryLastImportSidebarEntry* result;
 	LibraryLastImportSidebarEntry* _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_last_imported_entry;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1410 "Branch.c"
+#line 1410 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) {
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_last_imported_entry (self) != value) {
-#line 1419 "Branch.c"
+#line 1419 "LibraryBranch.c"
 		LibraryLastImportSidebarEntry* _tmp0_;
 		LibraryLastImportSidebarEntry* _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_last_imported_entry = _tmp1_;
-#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 12 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "last-imported-entry");
-#line 1432 "Branch.c"
+#line 1432 "LibraryBranch.c"
 	}
 }
 
@@ -1436,37 +1436,37 @@ static void library_branch_set_last_imported_entry (LibraryBranch* self, Library
 LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) {
 	LibraryImportQueueSidebarEntry* result;
 	LibraryImportQueueSidebarEntry* _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_import_queue_entry;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1448 "Branch.c"
+#line 1448 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) {
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_import_queue_entry (self) != value) {
-#line 1457 "Branch.c"
+#line 1457 "LibraryBranch.c"
 		LibraryImportQueueSidebarEntry* _tmp0_;
 		LibraryImportQueueSidebarEntry* _tmp1_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_import_queue_entry = _tmp1_;
-#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 13 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "import-queue-entry");
-#line 1470 "Branch.c"
+#line 1470 "LibraryBranch.c"
 	}
 }
 
@@ -1474,37 +1474,37 @@ static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryI
 LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) {
 	LibraryOfflineSidebarEntry* result;
 	LibraryOfflineSidebarEntry* _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_offline_entry;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1486 "Branch.c"
+#line 1486 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) {
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_offline_entry (self) != value) {
-#line 1495 "Branch.c"
+#line 1495 "LibraryBranch.c"
 		LibraryOfflineSidebarEntry* _tmp0_;
 		LibraryOfflineSidebarEntry* _tmp1_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_offline_entry = _tmp1_;
-#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 14 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "offline-entry");
-#line 1508 "Branch.c"
+#line 1508 "LibraryBranch.c"
 	}
 }
 
@@ -1512,94 +1512,94 @@ static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflin
 LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	LibraryTrashSidebarEntry* result;
 	LibraryTrashSidebarEntry* _tmp0_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->_trash_entry;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1524 "Branch.c"
+#line 1524 "LibraryBranch.c"
 }
 
 
 static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) {
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (library_branch_get_trash_entry (self) != value) {
-#line 1533 "Branch.c"
+#line 1533 "LibraryBranch.c"
 		LibraryTrashSidebarEntry* _tmp0_;
 		LibraryTrashSidebarEntry* _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = value;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		self->priv->_trash_entry = _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 15 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		g_object_notify ((GObject *) self, "trash-entry");
-#line 1546 "Branch.c"
+#line 1546 "LibraryBranch.c"
 	}
 }
 
 
 static void library_branch_class_init (LibraryBranchClass * klass) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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 "Branch.c"
+#line 1574 "LibraryBranch.c"
 }
 
 
 static void library_branch_instance_init (LibraryBranch * self) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
-#line 1581 "Branch.c"
+#line 1581 "LibraryBranch.c"
 }
 
 
 static void library_branch_finalize (GObject * obj) {
 	LibraryBranch * self;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
-#line 1603 "Branch.c"
+#line 1603 "LibraryBranch.c"
 }
 
 
@@ -1618,51 +1618,51 @@ GType library_branch_get_type (void) {
 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"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1660 "Branch.c"
+#line 1660 "LibraryBranch.c"
 		default:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1666 "Branch.c"
+#line 1666 "LibraryBranch.c"
 	}
 }
 
@@ -1670,69 +1670,69 @@ static void _vala_library_branch_get_property (GObject * object, guint property_
 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"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1712 "Branch.c"
+#line 1712 "LibraryBranch.c"
 		default:
-#line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 7 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1718 "Branch.c"
+#line 1718 "LibraryBranch.c"
 	}
 }
 
 
 LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
 	LibraryPhotosEntry * self = NULL;
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1729 "Branch.c"
+#line 1729 "LibraryBranch.c"
 }
 
 
 LibraryPhotosEntry* library_photos_entry_new (void) {
-#line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
-#line 1736 "Branch.c"
+#line 1736 "LibraryBranch.c"
 }
 
 
@@ -1740,15 +1740,15 @@ static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 96 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = g_strdup (_ ("Photos"));
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1752 "Branch.c"
+#line 1752 "LibraryBranch.c"
 }
 
 
@@ -1756,15 +1756,15 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
-#line 100 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_PHOTOS);
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1768 "Branch.c"
+#line 1768 "LibraryBranch.c"
 }
 
 
@@ -1772,30 +1772,30 @@ 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"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_ref_sink (_tmp0_);
-#line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1786 "Branch.c"
+#line 1786 "LibraryBranch.c"
 }
 
 
 static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
-#line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page;
-#line 1799 "Branch.c"
+#line 1799 "LibraryBranch.c"
 }
 
 
@@ -1817,26 +1817,26 @@ GType library_photos_entry_get_type (void) {
 
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type) {
 	LibraryHideablePageEntry * self = NULL;
-#line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 1825 "Branch.c"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = self->priv->show_entry;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	result = _tmp0_;
-#line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return result;
-#line 1840 "Branch.c"
+#line 1840 "LibraryBranch.c"
 }
 
 
@@ -1845,67 +1845,67 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 	gboolean _tmp1_;
 	gboolean _tmp2_;
 	gboolean _tmp3_;
-#line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = value;
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = self->priv->show_entry;
-#line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 118 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		return;
-#line 1859 "Branch.c"
+#line 1859 "LibraryBranch.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = value;
-#line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv->show_entry = _tmp2_;
-#line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = value;
-#line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	g_object_notify ((GObject *) self, "visible");
-#line 1871 "Branch.c"
+#line 1871 "LibraryBranch.c"
 }
 
 
 static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClass * klass) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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 "Branch.c"
+#line 1890 "LibraryBranch.c"
 }
 
 
 static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry * self) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self->priv->show_entry = FALSE;
-#line 1899 "Branch.c"
+#line 1899 "LibraryBranch.c"
 }
 
 
 static void library_hideable_page_entry_finalize (GObject * obj) {
 	LibraryHideablePageEntry * self;
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
-#line 1909 "Branch.c"
+#line 1909 "LibraryBranch.c"
 }
 
 
@@ -1924,21 +1924,21 @@ 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) {
 	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"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1936 "Branch.c"
+#line 1936 "LibraryBranch.c"
 		default:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1942 "Branch.c"
+#line 1942 "LibraryBranch.c"
 	}
 }
 
@@ -1946,30 +1946,30 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu
 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"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	switch (property_id) {
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1958 "Branch.c"
+#line 1958 "LibraryBranch.c"
 		default:
-#line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		break;
-#line 1964 "Branch.c"
+#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/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
-#line 1973 "Branch.c"
+#line 1973 "LibraryBranch.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -1978,27 +1978,27 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 		GeeCollection* _tmp3_;
 		GeeIterator* _tmp4_;
 		GeeIterator* _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp1_ = _tmp0_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp3_ = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_tmp5_ = _tmp4_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_media_collection_registry_unref0 (_tmp1_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_sources_it = _tmp5_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		while (TRUE) {
-#line 2002 "Branch.c"
+#line 2002 "LibraryBranch.c"
 			GeeIterator* _tmp6_;
 			gboolean _tmp7_;
 			MediaSourceCollection* sources = NULL;
@@ -2013,64 +2013,64 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			void* _tmp15__target;
 			ViewCollectionMonitor* _tmp16_;
 			ViewCollectionMonitor* _tmp17_;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp6_ = _sources_it;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			if (!_tmp7_) {
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 				break;
-#line 2025 "Branch.c"
+#line 2025 "LibraryBranch.c"
 			}
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp8_ = _sources_it;
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			sources = (MediaSourceCollection*) _tmp9_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp11_ = _tmp10_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp12_ = sources;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp14_ = _tmp13_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp15_ = monitor;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp15__target = monitor_target;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_tmp17_ = _tmp16_;
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_view_collection_monitor_unref0 (_tmp17_);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_view_manager_unref0 (_tmp14_);
-#line 136 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_data_collection_unref0 (_tmp11_);
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 			_data_collection_unref0 (sources);
-#line 2059 "Branch.c"
+#line 2059 "LibraryBranch.c"
 		}
-#line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		_g_object_unref0 (_sources_it);
-#line 2063 "Branch.c"
+#line 2063 "LibraryBranch.c"
 	}
-#line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return self;
-#line 2067 "Branch.c"
+#line 2067 "LibraryBranch.c"
 }
 
 
 LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
-#line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
-#line 2074 "Branch.c"
+#line 2074 "LibraryBranch.c"
 }
 
 
@@ -2082,31 +2082,31 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_vala_sort_order = _tmp2_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_vala_sort_by = _tmp3_;
-#line 140 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 140 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (sort_order) {
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		*sort_order = _vala_sort_order;
-#line 2104 "Branch.c"
+#line 2104 "LibraryBranch.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	if (sort_by) {
-#line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 		*sort_by = _vala_sort_by;
-#line 2110 "Branch.c"
+#line 2110 "LibraryBranch.c"
 	}
 }
 
@@ -2117,32 +2117,32 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo
 	ConfigFacade* _tmp1_;
 	gboolean _tmp2_;
 	gint _tmp3_;
-#line 143 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp1_ = _tmp0_;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp2_ = sort_order;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_tmp3_ = sort_by;
-#line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/LibraryBranch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2135 "Branch.c"
+#line 2135 "LibraryBranch.c"
 }
 
 
 static void library_main_page_class_init (LibraryMainPageClass * klass) {
-#line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
+#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/Branch.vala"
+#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/Branch.vala"
+#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 "Branch.c"
+#line 2146 "LibraryBranch.c"
 }
 
 
diff --git a/src/library/Branch.vala b/src/library/LibraryBranch.vala
index bab17fc..f9113f5 100644
--- a/src/library/Branch.vala
+++ b/src/library/LibraryBranch.vala
@@ -27,7 +27,7 @@ public class Library.Branch : Sidebar.Branch {
     }
     
     public Branch() {
-        base(new Sidebar.Header(_("Library")),
+        base(new Sidebar.Header(_("Library"), _("Organize and browse your photos")),
             Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
 
         photos_entry = new Library.PhotosEntry();
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 524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		copy_files_response = _tmp14_;
 #line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = import_dialog;
+		_tmp23_ = copy_files_response;
 #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 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_free0 (self->priv->import_dir);
-#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"
-	_tmp24_ = import_dialog;
+			_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"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp30_ = _tmp29_;
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			library_window_dispatch_import_jobs (self, _tmp26_, "folders", _tmp27_ == GTK_RESPONSE_ACCEPT, _tmp30_);
+#line 529 "/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);