Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 301 insertions, 278 deletions

diff --git a/src/library/Branch.c b/src/library/Branch.c
index 9a3d452..92955e2 100644
--- a/src/library/Branch.c
+++ b/src/library/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.34.7, the Vala compiler
+/* Branch.c generated by valac 0.36.6, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -239,6 +239,11 @@ typedef struct _CollectionPageClass CollectionPageClass;
 typedef struct _LibraryMainPage LibraryMainPage;
 typedef struct _LibraryMainPageClass LibraryMainPageClass;
 typedef struct _LibraryHideablePageEntryPrivate LibraryHideablePageEntryPrivate;
+enum  {
+	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL,
+	LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL
+};
+static guint library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_LAST_SIGNAL] = {0};
 typedef struct _PagePrivate PagePrivate;
 
 #define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -786,12 +791,12 @@ GType library_trash_sidebar_entry_get_type (void) G_GNUC_CONST;
 #define LIBRARY_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_BRANCH, LibraryBranchPrivate))
 enum  {
 	LIBRARY_BRANCH_DUMMY_PROPERTY,
-	LIBRARY_BRANCH_PHOTOS_ENTRY,
-	LIBRARY_BRANCH_FLAGGED_ENTRY,
-	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY,
-	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY,
-	LIBRARY_BRANCH_OFFLINE_ENTRY,
-	LIBRARY_BRANCH_TRASH_ENTRY
+	LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY,
+	LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY
 };
 static GType library_branch_entry_position_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define LIBRARY_BRANCH_POSITION_DATA "x-photos-entry-position"
@@ -847,7 +852,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self);
 gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
 void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void library_branch_finalize (GObject* obj);
+static void library_branch_finalize (GObject * obj);
 static void _vala_library_branch_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_library_branch_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
@@ -871,11 +876,11 @@ GType library_main_page_get_type (void) G_GNUC_CONST;
 #define LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntryPrivate))
 enum  {
 	LIBRARY_HIDEABLE_PAGE_ENTRY_DUMMY_PROPERTY,
-	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE
+	LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY
 };
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
 void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
-static void library_hideable_page_entry_finalize (GObject* obj);
+static void library_hideable_page_entry_finalize (GObject * obj);
 static void _vala_library_hideable_page_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 static void _vala_library_hideable_page_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 GType page_window_get_type (void) G_GNUC_CONST;
@@ -991,170 +996,167 @@ static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpoi
 	result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 995 "Branch.c"
+#line 1000 "Branch.c"
 }
 
 
 static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
-#line 1002 "Branch.c"
+#line 1007 "Branch.c"
 }
 
 
 static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
-#line 1009 "Branch.c"
+#line 1014 "Branch.c"
 }
 
 
 static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
-#line 1016 "Branch.c"
+#line 1021 "Branch.c"
 }
 
 
 static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
-#line 1023 "Branch.c"
+#line 1028 "Branch.c"
 }
 
 
 LibraryBranch* library_branch_construct (GType object_type) {
 	LibraryBranch * self = NULL;
-	const gchar* _tmp0_ = NULL;
-	SidebarHeader* _tmp1_ = NULL;
-	SidebarHeader* _tmp2_ = NULL;
-	LibraryPhotosEntry* _tmp3_ = NULL;
-	LibraryPhotosEntry* _tmp4_ = NULL;
-	LibraryTrashSidebarEntry* _tmp5_ = NULL;
-	LibraryTrashSidebarEntry* _tmp6_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp7_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp8_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp9_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp10_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp11_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp12_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp13_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp14_ = NULL;
-	LibraryPhotosEntry* _tmp15_ = NULL;
-	LibraryTrashSidebarEntry* _tmp16_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp17_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp18_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp19_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp20_ = NULL;
-#line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = _ ("Library");
+	SidebarHeader* _tmp0_;
+	SidebarHeader* _tmp1_;
+	LibraryPhotosEntry* _tmp2_;
+	LibraryPhotosEntry* _tmp3_;
+	LibraryTrashSidebarEntry* _tmp4_;
+	LibraryTrashSidebarEntry* _tmp5_;
+	LibraryLastImportSidebarEntry* _tmp6_;
+	LibraryLastImportSidebarEntry* _tmp7_;
+	LibraryFlaggedSidebarEntry* _tmp8_;
+	LibraryFlaggedSidebarEntry* _tmp9_;
+	LibraryOfflineSidebarEntry* _tmp10_;
+	LibraryOfflineSidebarEntry* _tmp11_;
+	LibraryImportQueueSidebarEntry* _tmp12_;
+	LibraryImportQueueSidebarEntry* _tmp13_;
+	LibraryPhotosEntry* _tmp14_;
+	LibraryTrashSidebarEntry* _tmp15_;
+	LibraryFlaggedSidebarEntry* _tmp16_;
+	LibraryLastImportSidebarEntry* _tmp17_;
+	LibraryImportQueueSidebarEntry* _tmp18_;
+	LibraryOfflineSidebarEntry* _tmp19_;
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = sidebar_header_new (_tmp0_, TRUE);
+	_tmp0_ = sidebar_header_new (_ ("Library"), TRUE);
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL);
+	self = (LibraryBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _library_branch_comparator_gcompare_func, NULL);
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp3_ = library_photos_entry_new ();
+	_tmp2_ = library_photos_entry_new ();
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_photos_entry (self, _tmp4_);
+	library_branch_set_photos_entry (self, _tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp5_ = library_trash_sidebar_entry_new ();
+	_tmp4_ = library_trash_sidebar_entry_new ();
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_trash_entry (self, _tmp6_);
+	library_branch_set_trash_entry (self, _tmp5_);
 #line 34 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp7_ = library_last_import_sidebar_entry_new ();
+	_tmp6_ = library_last_import_sidebar_entry_new ();
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_last_imported_entry (self, _tmp8_);
+	library_branch_set_last_imported_entry (self, _tmp7_);
 #line 35 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp9_ = library_flagged_sidebar_entry_new ();
+	_tmp8_ = library_flagged_sidebar_entry_new ();
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_flagged_entry (self, _tmp10_);
+	library_branch_set_flagged_entry (self, _tmp9_);
 #line 36 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp11_ = library_offline_sidebar_entry_new ();
+	_tmp10_ = library_offline_sidebar_entry_new ();
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_offline_entry (self, _tmp12_);
+	library_branch_set_offline_entry (self, _tmp11_);
 #line 37 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp12_);
+	_g_object_unref0 (_tmp11_);
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp13_ = library_import_queue_sidebar_entry_new ();
+	_tmp12_ = library_import_queue_sidebar_entry_new ();
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_set_import_queue_entry (self, _tmp14_);
+	library_branch_set_import_queue_entry (self, _tmp13_);
 #line 38 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp13_);
 #line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp15_ = self->priv->_photos_entry;
+	_tmp14_ = self->priv->_photos_entry;
 #line 40 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_PHOTOS);
+	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"
-	_tmp16_ = self->priv->_trash_entry;
+	_tmp15_ = self->priv->_trash_entry;
 #line 41 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_TRASH);
+	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"
-	_tmp17_ = self->priv->_flagged_entry;
+	_tmp16_ = self->priv->_flagged_entry;
 #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 44 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_flagged_visibility_changed (self);
 #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp18_ = self->priv->_last_imported_entry;
+	_tmp17_ = self->priv->_last_imported_entry;
 #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 47 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_last_imported_visibility_changed (self);
 #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp19_ = self->priv->_import_queue_entry;
+	_tmp18_ = self->priv->_import_queue_entry;
 #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 50 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_import_queue_visibility_changed (self);
 #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp20_ = self->priv->_offline_entry;
+	_tmp19_ = self->priv->_offline_entry;
 #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), "visibility-changed", (GCallback) _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed, self, 0);
 #line 53 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_offline_visibility_changed (self);
 #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1142 "Branch.c"
+#line 1144 "Branch.c"
 }
 
 
 LibraryBranch* library_branch_new (void) {
 #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_branch_construct (LIBRARY_TYPE_BRANCH);
-#line 1149 "Branch.c"
+#line 1151 "Branch.c"
 }
 
 
 static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gint position) {
-	SidebarEntry* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	SidebarEntry* _tmp2_ = NULL;
-	SidebarEntry* _tmp3_ = NULL;
-	SidebarEntry* _tmp4_ = NULL;
+	SidebarEntry* _tmp0_;
+	gint _tmp1_;
+	SidebarEntry* _tmp2_;
+	SidebarEntry* _tmp3_;
+	SidebarEntry* _tmp4_;
 #line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 56 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1175,62 +1177,62 @@ static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gin
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL);
 #line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1179 "Branch.c"
+#line 1181 "Branch.c"
 }
 
 
 static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
-	LibraryFlaggedSidebarEntry* _tmp0_ = NULL;
+	LibraryFlaggedSidebarEntry* _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_flagged_entry;
 #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED);
-#line 1191 "Branch.c"
+#line 1193 "Branch.c"
 }
 
 
 static void library_branch_on_last_imported_visibility_changed (LibraryBranch* self) {
-	LibraryLastImportSidebarEntry* _tmp0_ = NULL;
+	LibraryLastImportSidebarEntry* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_last_imported_entry;
 #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED);
-#line 1203 "Branch.c"
+#line 1205 "Branch.c"
 }
 
 
 static void library_branch_on_import_queue_visibility_changed (LibraryBranch* self) {
-	LibraryImportQueueSidebarEntry* _tmp0_ = NULL;
+	LibraryImportQueueSidebarEntry* _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_import_queue_entry;
 #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE);
-#line 1215 "Branch.c"
+#line 1217 "Branch.c"
 }
 
 
 static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
-	LibraryOfflineSidebarEntry* _tmp0_ = NULL;
+	LibraryOfflineSidebarEntry* _tmp0_;
 #line 73 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp0_ = self->priv->_offline_entry;
 #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE);
-#line 1227 "Branch.c"
+#line 1229 "Branch.c"
 }
 
 
 static void library_branch_update_entry_visibility (LibraryBranch* self, LibraryHideablePageEntry* entry, gint position) {
-	LibraryHideablePageEntry* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
+	LibraryHideablePageEntry* _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 77 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1243,42 +1245,42 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 	_tmp2_ = _tmp1_;
 #line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	if (_tmp2_) {
-#line 1247 "Branch.c"
-		LibraryHideablePageEntry* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
+#line 1249 "Branch.c"
+		LibraryHideablePageEntry* _tmp3_;
+		gboolean _tmp4_;
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp3_ = entry;
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		if (!_tmp4_) {
-#line 1256 "Branch.c"
-			LibraryHideablePageEntry* _tmp5_ = NULL;
-			gint _tmp6_ = 0;
+#line 1258 "Branch.c"
+			LibraryHideablePageEntry* _tmp5_;
+			gint _tmp6_;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp5_ = entry;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp6_ = position;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_);
-#line 1265 "Branch.c"
+#line 1267 "Branch.c"
 		}
 	} else {
-		LibraryHideablePageEntry* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
+		LibraryHideablePageEntry* _tmp7_;
+		gboolean _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp7_ = entry;
 #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		if (_tmp8_) {
-#line 1276 "Branch.c"
-			LibraryHideablePageEntry* _tmp9_ = NULL;
+#line 1278 "Branch.c"
+			LibraryHideablePageEntry* _tmp9_;
 #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp9_ = entry;
 #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1282 "Branch.c"
+#line 1284 "Branch.c"
 		}
 	}
 }
@@ -1286,10 +1288,10 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 
 static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	gint result = 0;
-	SidebarEntry* _tmp0_ = NULL;
-	gconstpointer _tmp1_ = NULL;
-	SidebarEntry* _tmp2_ = NULL;
-	gconstpointer _tmp3_ = NULL;
+	SidebarEntry* _tmp0_;
+	gconstpointer _tmp1_;
+	SidebarEntry* _tmp2_;
+	gconstpointer _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
 #line 86 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1306,13 +1308,13 @@ static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_));
 #line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1310 "Branch.c"
+#line 1312 "Branch.c"
 }
 
 
 LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	LibraryPhotosEntry* result;
-	LibraryPhotosEntry* _tmp0_ = NULL;
+	LibraryPhotosEntry* _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1321,39 +1323,43 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1325 "Branch.c"
+#line 1327 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1332 "Branch.c"
+#line 1334 "Branch.c"
 }
 
 
 static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosEntry* value) {
-	LibraryPhotosEntry* _tmp0_ = NULL;
-	LibraryPhotosEntry* _tmp1_ = NULL;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_photos_entry (self) != value) {
+#line 1343 "Branch.c"
+		LibraryPhotosEntry* _tmp0_;
+		LibraryPhotosEntry* _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_photos_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_photos_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_photos_entry);
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "photos-entry");
-#line 1351 "Branch.c"
+		self->priv->_photos_entry = _tmp1_;
+#line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "photos-entry");
+#line 1356 "Branch.c"
+	}
 }
 
 
 LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* self) {
 	LibraryFlaggedSidebarEntry* result;
-	LibraryFlaggedSidebarEntry* _tmp0_ = NULL;
+	LibraryFlaggedSidebarEntry* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1362,32 +1368,36 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1366 "Branch.c"
+#line 1372 "Branch.c"
 }
 
 
 static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlaggedSidebarEntry* value) {
-	LibraryFlaggedSidebarEntry* _tmp0_ = NULL;
-	LibraryFlaggedSidebarEntry* _tmp1_ = NULL;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_flagged_entry (self) != value) {
+#line 1381 "Branch.c"
+		LibraryFlaggedSidebarEntry* _tmp0_;
+		LibraryFlaggedSidebarEntry* _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_flagged_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		_g_object_unref0 (self->priv->_flagged_entry);
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_flagged_entry = _tmp1_;
+		self->priv->_flagged_entry = _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "flagged-entry");
-#line 1385 "Branch.c"
+		g_object_notify ((GObject *) self, "flagged-entry");
+#line 1394 "Branch.c"
+	}
 }
 
 
 LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBranch* self) {
 	LibraryLastImportSidebarEntry* result;
-	LibraryLastImportSidebarEntry* _tmp0_ = NULL;
+	LibraryLastImportSidebarEntry* _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1396,32 +1406,36 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr
 	result = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1400 "Branch.c"
+#line 1410 "Branch.c"
 }
 
 
 static void library_branch_set_last_imported_entry (LibraryBranch* self, LibraryLastImportSidebarEntry* value) {
-	LibraryLastImportSidebarEntry* _tmp0_ = NULL;
-	LibraryLastImportSidebarEntry* _tmp1_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_last_imported_entry (self) != value) {
+#line 1419 "Branch.c"
+		LibraryLastImportSidebarEntry* _tmp0_;
+		LibraryLastImportSidebarEntry* _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_last_imported_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_last_imported_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_last_imported_entry);
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "last-imported-entry");
-#line 1419 "Branch.c"
+		self->priv->_last_imported_entry = _tmp1_;
+#line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "last-imported-entry");
+#line 1432 "Branch.c"
+	}
 }
 
 
 LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBranch* self) {
 	LibraryImportQueueSidebarEntry* result;
-	LibraryImportQueueSidebarEntry* _tmp0_ = NULL;
+	LibraryImportQueueSidebarEntry* _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1430,32 +1444,36 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr
 	result = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1434 "Branch.c"
+#line 1448 "Branch.c"
 }
 
 
 static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryImportQueueSidebarEntry* value) {
-	LibraryImportQueueSidebarEntry* _tmp0_ = NULL;
-	LibraryImportQueueSidebarEntry* _tmp1_ = NULL;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_import_queue_entry (self) != value) {
+#line 1457 "Branch.c"
+		LibraryImportQueueSidebarEntry* _tmp0_;
+		LibraryImportQueueSidebarEntry* _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_import_queue_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_import_queue_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_import_queue_entry);
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "import-queue-entry");
-#line 1453 "Branch.c"
+		self->priv->_import_queue_entry = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "import-queue-entry");
+#line 1470 "Branch.c"
+	}
 }
 
 
 LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* self) {
 	LibraryOfflineSidebarEntry* result;
-	LibraryOfflineSidebarEntry* _tmp0_ = NULL;
+	LibraryOfflineSidebarEntry* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1464,32 +1482,36 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1468 "Branch.c"
+#line 1486 "Branch.c"
 }
 
 
 static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflineSidebarEntry* value) {
-	LibraryOfflineSidebarEntry* _tmp0_ = NULL;
-	LibraryOfflineSidebarEntry* _tmp1_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_offline_entry (self) != value) {
+#line 1495 "Branch.c"
+		LibraryOfflineSidebarEntry* _tmp0_;
+		LibraryOfflineSidebarEntry* _tmp1_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_offline_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		_g_object_unref0 (self->priv->_offline_entry);
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_offline_entry = _tmp1_;
+		self->priv->_offline_entry = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "offline-entry");
-#line 1487 "Branch.c"
+		g_object_notify ((GObject *) self, "offline-entry");
+#line 1508 "Branch.c"
+	}
 }
 
 
 LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	LibraryTrashSidebarEntry* result;
-	LibraryTrashSidebarEntry* _tmp0_ = NULL;
+	LibraryTrashSidebarEntry* _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_BRANCH (self), NULL);
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1498,26 +1520,30 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1502 "Branch.c"
+#line 1524 "Branch.c"
 }
 
 
 static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSidebarEntry* value) {
-	LibraryTrashSidebarEntry* _tmp0_ = NULL;
-	LibraryTrashSidebarEntry* _tmp1_ = NULL;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_BRANCH (self));
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = value;
+	if (library_branch_get_trash_entry (self) != value) {
+#line 1533 "Branch.c"
+		LibraryTrashSidebarEntry* _tmp0_;
+		LibraryTrashSidebarEntry* _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+		_tmp0_ = value;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_g_object_unref0 (self->priv->_trash_entry);
+		_tmp1_ = _g_object_ref0 (_tmp0_);
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	self->priv->_trash_entry = _tmp1_;
+		_g_object_unref0 (self->priv->_trash_entry);
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_notify ((GObject *) self, "trash-entry");
-#line 1521 "Branch.c"
+		self->priv->_trash_entry = _tmp1_;
+#line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
+		g_object_notify ((GObject *) self, "trash-entry");
+#line 1546 "Branch.c"
+	}
 }
 
 
@@ -1533,29 +1559,29 @@ static void library_branch_class_init (LibraryBranchClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_branch_finalize;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY, g_param_spec_object ("photos-entry", "photos-entry", "photos-entry", LIBRARY_TYPE_PHOTOS_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY, g_param_spec_object ("flagged-entry", "flagged-entry", "flagged-entry", LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY, g_param_spec_object ("last-imported-entry", "last-imported-entry", "last-imported-entry", LIBRARY_TYPE_LAST_IMPORT_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY, g_param_spec_object ("import-queue-entry", "import-queue-entry", "import-queue-entry", LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY, 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 1548 "Branch.c"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 1574 "Branch.c"
 }
 
 
 static void library_branch_instance_init (LibraryBranch * self) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
-#line 1555 "Branch.c"
+#line 1581 "Branch.c"
 }
 
 
-static void library_branch_finalize (GObject* obj) {
+static void library_branch_finalize (GObject * obj) {
 	LibraryBranch * self;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_BRANCH, LibraryBranch);
@@ -1573,7 +1599,7 @@ static void library_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->_trash_entry);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
-#line 1577 "Branch.c"
+#line 1603 "Branch.c"
 }
 
 
@@ -1595,48 +1621,48 @@ static void _vala_library_branch_get_property (GObject * object, guint property_
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_PHOTOS_ENTRY:
+		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_photos_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_FLAGGED_ENTRY:
+		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_flagged_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY:
+		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_last_imported_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY:
+		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_import_queue_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_OFFLINE_ENTRY:
+		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_offline_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_TRASH_ENTRY:
+		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_object (value, library_branch_get_trash_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1634 "Branch.c"
+#line 1660 "Branch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1640 "Branch.c"
+#line 1666 "Branch.c"
 	}
 }
 
@@ -1647,48 +1673,48 @@ static void _vala_library_branch_set_property (GObject * object, guint property_
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_PHOTOS_ENTRY:
+		case LIBRARY_BRANCH_PHOTOS_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_photos_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_FLAGGED_ENTRY:
+		case LIBRARY_BRANCH_FLAGGED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_flagged_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY:
+		case LIBRARY_BRANCH_LAST_IMPORTED_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_last_imported_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY:
+		case LIBRARY_BRANCH_IMPORT_QUEUE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_import_queue_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_OFFLINE_ENTRY:
+		case LIBRARY_BRANCH_OFFLINE_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_offline_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_BRANCH_TRASH_ENTRY:
+		case LIBRARY_BRANCH_TRASH_ENTRY_PROPERTY:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_branch_set_trash_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1686 "Branch.c"
+#line 1712 "Branch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1692 "Branch.c"
+#line 1718 "Branch.c"
 	}
 }
 
@@ -1699,40 +1725,37 @@ LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
 	self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1703 "Branch.c"
+#line 1729 "Branch.c"
 }
 
 
 LibraryPhotosEntry* library_photos_entry_new (void) {
 #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
-#line 1710 "Branch.c"
+#line 1736 "Branch.c"
 }
 
 
 static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp0_;
 #line 96 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
 #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp0_ = _ ("Photos");
+	_tmp0_ = g_strdup (_ ("Photos"));
 #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1729 "Branch.c"
+#line 1752 "Branch.c"
 }
 
 
 static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
 	LibraryPhotosEntry * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 100 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
 #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1741,14 +1764,14 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1745 "Branch.c"
+#line 1768 "Branch.c"
 }
 
 
 static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base) {
 	LibraryPhotosEntry * self;
 	Page* result = NULL;
-	LibraryMainPage* _tmp0_ = NULL;
+	LibraryMainPage* _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_PHOTOS_ENTRY, LibraryPhotosEntry);
 #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1759,7 +1782,7 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1763 "Branch.c"
+#line 1786 "Branch.c"
 }
 
 
@@ -1767,12 +1790,12 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_photos_entry_parent_class = g_type_class_peek_parent (klass);
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_name;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_name;
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_get_sidebar_icon;
+	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = (gchar* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_get_sidebar_icon;
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*)(SidebarSimplePageEntry*)) library_photos_entry_real_create_page;
-#line 1776 "Branch.c"
+	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_photos_entry_real_create_page;
+#line 1799 "Branch.c"
 }
 
 
@@ -1798,13 +1821,13 @@ LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_ty
 	self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1802 "Branch.c"
+#line 1825 "Branch.c"
 }
 
 
 gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self) {
 	gboolean result;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_val_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self), FALSE);
 #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1813,15 +1836,15 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self
 	result = _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1817 "Branch.c"
+#line 1840 "Branch.c"
 }
 
 
 void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value) {
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
+	gboolean _tmp0_;
+	gboolean _tmp1_;
+	gboolean _tmp2_;
+	gboolean _tmp3_;
 #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_return_if_fail (LIBRARY_IS_HIDEABLE_PAGE_ENTRY (self));
 #line 117 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1832,7 +1855,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 	if (_tmp0_ == _tmp1_) {
 #line 118 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		return;
-#line 1836 "Branch.c"
+#line 1859 "Branch.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp2_ = value;
@@ -1841,10 +1864,10 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 #line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp3_ = value;
 #line 121 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
+	g_signal_emit (self, library_hideable_page_entry_signals[LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBILITY_CHANGED_SIGNAL], 0, _tmp3_);
 #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "visible");
-#line 1848 "Branch.c"
+#line 1871 "Branch.c"
 }
 
 
@@ -1860,10 +1883,10 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_hideable_page_entry_finalize;
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY, 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"
-	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 1867 "Branch.c"
+	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"
 }
 
 
@@ -1872,17 +1895,17 @@ static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry
 	self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self);
 #line 113 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self->priv->show_entry = FALSE;
-#line 1876 "Branch.c"
+#line 1899 "Branch.c"
 }
 
 
-static void library_hideable_page_entry_finalize (GObject* obj) {
+static void library_hideable_page_entry_finalize (GObject * obj) {
 	LibraryHideablePageEntry * self;
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
-#line 1886 "Branch.c"
+#line 1909 "Branch.c"
 }
 
 
@@ -1904,18 +1927,18 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE:
+		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		g_value_set_boolean (value, library_hideable_page_entry_get_visible (self));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1913 "Branch.c"
+#line 1936 "Branch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1919 "Branch.c"
+#line 1942 "Branch.c"
 	}
 }
 
@@ -1926,18 +1949,18 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	switch (property_id) {
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
-		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE:
+		case LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE_PROPERTY:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		library_hideable_page_entry_set_visible (self, g_value_get_boolean (value));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1935 "Branch.c"
+#line 1958 "Branch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1941 "Branch.c"
+#line 1964 "Branch.c"
 	}
 }
 
@@ -1946,15 +1969,15 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 	LibraryMainPage * self = NULL;
 #line 133 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
-#line 1950 "Branch.c"
+#line 1973 "Branch.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp0_ = NULL;
-		MediaCollectionRegistry* _tmp1_ = NULL;
-		GeeCollection* _tmp2_ = NULL;
-		GeeCollection* _tmp3_ = NULL;
-		GeeIterator* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
+		MediaCollectionRegistry* _tmp0_;
+		MediaCollectionRegistry* _tmp1_;
+		GeeCollection* _tmp2_;
+		GeeCollection* _tmp3_;
+		GeeIterator* _tmp4_;
+		GeeIterator* _tmp5_;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1975,21 +1998,21 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 		_sources_it = _tmp5_;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		while (TRUE) {
-#line 1979 "Branch.c"
-			GeeIterator* _tmp6_ = NULL;
-			gboolean _tmp7_ = FALSE;
+#line 2002 "Branch.c"
+			GeeIterator* _tmp6_;
+			gboolean _tmp7_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp8_ = NULL;
-			gpointer _tmp9_ = NULL;
-			ViewCollection* _tmp10_ = NULL;
-			ViewCollection* _tmp11_ = NULL;
-			MediaSourceCollection* _tmp12_ = NULL;
-			CollectionViewManager* _tmp13_ = NULL;
-			CollectionViewManager* _tmp14_ = NULL;
-			ProgressMonitor _tmp15_ = NULL;
-			void* _tmp15__target = NULL;
-			ViewCollectionMonitor* _tmp16_ = NULL;
-			ViewCollectionMonitor* _tmp17_ = NULL;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			ViewCollection* _tmp10_;
+			ViewCollection* _tmp11_;
+			MediaSourceCollection* _tmp12_;
+			CollectionViewManager* _tmp13_;
+			CollectionViewManager* _tmp14_;
+			ProgressMonitor _tmp15_;
+			void* _tmp15__target;
+			ViewCollectionMonitor* _tmp16_;
+			ViewCollectionMonitor* _tmp17_;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp6_ = _sources_it;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1998,7 +2021,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			if (!_tmp7_) {
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 				break;
-#line 2002 "Branch.c"
+#line 2025 "Branch.c"
 			}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp8_ = _sources_it;
@@ -2032,22 +2055,22 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			_data_collection_unref0 (_tmp11_);
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_data_collection_unref0 (sources);
-#line 2036 "Branch.c"
+#line 2059 "Branch.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_g_object_unref0 (_sources_it);
-#line 2040 "Branch.c"
+#line 2063 "Branch.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 2044 "Branch.c"
+#line 2067 "Branch.c"
 }
 
 
 LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
 #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
-#line 2051 "Branch.c"
+#line 2074 "Branch.c"
 }
 
 
@@ -2055,8 +2078,8 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	LibraryMainPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -2077,23 +2100,23 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	if (sort_order) {
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		*sort_order = _vala_sort_order;
-#line 2081 "Branch.c"
+#line 2104 "Branch.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	if (sort_by) {
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		*sort_by = _vala_sort_by;
-#line 2087 "Branch.c"
+#line 2110 "Branch.c"
 	}
 }
 
 
 static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
 	LibraryMainPage * self;
-	ConfigFacade* _tmp0_ = NULL;
-	ConfigFacade* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
+	gboolean _tmp2_;
+	gint _tmp3_;
 #line 143 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_MAIN_PAGE, LibraryMainPage);
 #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -2108,7 +2131,7 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2112 "Branch.c"
+#line 2135 "Branch.c"
 }
 
 
@@ -2116,10 +2139,10 @@ static void library_main_page_class_init (LibraryMainPageClass * klass) {
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_main_page_parent_class = g_type_class_peek_parent (klass);
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->get_config_photos_sort = (void (*)(MediaPage*, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
+	((MediaPageClass *) klass)->get_config_photos_sort = (void (*) (MediaPage *, gboolean*, gint*)) library_main_page_real_get_config_photos_sort;
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
-	((MediaPageClass *) klass)->set_config_photos_sort = (void (*)(MediaPage*, gboolean, gint)) library_main_page_real_set_config_photos_sort;
-#line 2123 "Branch.c"
+	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) library_main_page_real_set_config_photos_sort;
+#line 2146 "Branch.c"
 }