Merge branch 'feature/upstream' into develop

1 files changed, 170 insertions, 126 deletions

diff --git a/src/library/FlaggedSidebarEntry.c b/src/library/FlaggedSidebarEntry.c
index 01f84fd..b42df00 100644
--- a/src/library/FlaggedSidebarEntry.c
+++ b/src/library/FlaggedSidebarEntry.c
@@ -1,4 +1,4 @@
-/* FlaggedSidebarEntry.c generated by valac 0.36.6, the Vala compiler
+/* FlaggedSidebarEntry.c generated by valac 0.40.4, the Vala compiler
  * generated from FlaggedSidebarEntry.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -149,6 +150,11 @@ typedef struct _MediaSourceClass MediaSourceClass;
 typedef struct _LibraryFlaggedSidebarEntry LibraryFlaggedSidebarEntry;
 typedef struct _LibraryFlaggedSidebarEntryClass LibraryFlaggedSidebarEntryClass;
 typedef struct _LibraryFlaggedSidebarEntryPrivate LibraryFlaggedSidebarEntryPrivate;
+enum  {
+	LIBRARY_FLAGGED_SIDEBAR_ENTRY_0_PROPERTY,
+	LIBRARY_FLAGGED_SIDEBAR_ENTRY_NUM_PROPERTIES
+};
+static GParamSpec* library_flagged_sidebar_entry_properties[LIBRARY_FLAGGED_SIDEBAR_ENTRY_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -375,14 +381,17 @@ GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType sidebar_internal_drop_target_entry_get_type (void) G_GNUC_CONST;
 GType library_flagged_sidebar_entry_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_FLAGGED_SIDEBAR_ENTRY_DUMMY_PROPERTY
-};
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
@@ -390,20 +399,28 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 gpointer media_collection_registry_ref (gpointer instance);
 void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+                                          gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+                                           gpointer v_object);
 gpointer value_get_media_collection_registry (const GValue* value);
 GType media_collection_registry_get_type (void) G_GNUC_CONST;
 MediaCollectionRegistry* media_collection_registry_get_instance (void);
 GeeCollection* media_collection_registry_get_all (MediaCollectionRegistry* self);
 static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self);
-static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self);
+static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender,
+                                                                                                                  gpointer self);
 LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void);
 LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type);
 LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_type);
 static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self);
-void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
+void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self,
+                                              gboolean value);
 static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
 #define FLAGGED_PAGE_NAME _ ("Flagged")
 static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
@@ -415,40 +432,56 @@ GType checkerboard_page_get_type (void) G_GNUC_CONST;
 GType media_page_get_type (void) G_GNUC_CONST;
 GType collection_page_get_type (void) G_GNUC_CONST;
 GType flagged_page_get_type (void) G_GNUC_CONST;
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media);
+static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+                                                                    GeeList* media);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_command_manager (GValue* value,
+                                gpointer v_object);
+void value_take_command_manager (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* app_window_get_command_manager (void);
 GType command_get_type (void) G_GNUC_CONST;
-void command_manager_execute (CommandManager* self, Command* command);
-FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag);
-FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
+FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources,
+                                            gboolean flag);
+FlagUnflagCommand* flag_unflag_command_construct (GType object_type,
+                                                  GeeCollection* sources,
+                                                  gboolean flag);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
 GType flag_unflag_command_get_type (void) G_GNUC_CONST;
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data);
+static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+                                                                              GtkSelectionData* data);
 GeeCollection* media_source_collection_get_flagged (MediaSourceCollection* self);
 static void library_flagged_sidebar_entry_finalize (GObject * obj);
 
 
-static void _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender, gpointer self) {
+static void
+_library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered (MediaSourceCollection* _sender,
+                                                                                                             gpointer self)
+{
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_on_flagged_contents_altered ((LibraryFlaggedSidebarEntry*) self);
-#line 443 "FlaggedSidebarEntry.c"
+#line 475 "FlaggedSidebarEntry.c"
 }
 
 
-LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType object_type) {
+LibraryFlaggedSidebarEntry*
+library_flagged_sidebar_entry_construct (GType object_type)
+{
 	LibraryFlaggedSidebarEntry * self = NULL;
-	gint _tmp11_;
 #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = (LibraryFlaggedSidebarEntry*) library_hideable_page_entry_construct (object_type);
-#line 452 "FlaggedSidebarEntry.c"
+#line 485 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -477,59 +510,58 @@ LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_construct (GType objec
 		_media_sources_it = _tmp5_;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
-#line 481 "FlaggedSidebarEntry.c"
+#line 514 "FlaggedSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 				break;
-#line 496 "FlaggedSidebarEntry.c"
+#line 526 "FlaggedSidebarEntry.c"
 			}
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			g_signal_connect_object (_tmp10_, "flagged-contents-altered", (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self, 0);
+			g_signal_connect_object (_tmp9_, "flagged-contents-altered", (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self, 0);
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 510 "FlaggedSidebarEntry.c"
+#line 540 "FlaggedSidebarEntry.c"
 		}
 #line 9 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 514 "FlaggedSidebarEntry.c"
+#line 544 "FlaggedSidebarEntry.c"
 	}
 #line 12 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp11_ = library_flagged_sidebar_entry_get_total_flagged (self);
-#line 12 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp11_ != 0);
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_flagged_sidebar_entry_get_total_flagged (self) != 0);
 #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return self;
-#line 522 "FlaggedSidebarEntry.c"
+#line 550 "FlaggedSidebarEntry.c"
 }
 
 
-LibraryFlaggedSidebarEntry* library_flagged_sidebar_entry_new (void) {
+LibraryFlaggedSidebarEntry*
+library_flagged_sidebar_entry_new (void)
+{
 #line 8 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return library_flagged_sidebar_entry_construct (LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY);
-#line 529 "FlaggedSidebarEntry.c"
+#line 559 "FlaggedSidebarEntry.c"
 }
 
 
-static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base) {
+static gchar*
+library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -541,11 +573,13 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_name (SidebarSimple
 	result = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 545 "FlaggedSidebarEntry.c"
+#line 577 "FlaggedSidebarEntry.c"
 }
 
 
-static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base) {
+static gchar*
+library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gchar* result = NULL;
 	gchar* _tmp0_;
@@ -557,11 +591,13 @@ static gchar* library_flagged_sidebar_entry_real_get_sidebar_icon (SidebarSimple
 	result = _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 561 "FlaggedSidebarEntry.c"
+#line 595 "FlaggedSidebarEntry.c"
 }
 
 
-static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base) {
+static Page*
+library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
+{
 	LibraryFlaggedSidebarEntry * self;
 	Page* result = NULL;
 	FlaggedPage* _tmp0_;
@@ -575,18 +611,20 @@ static Page* library_flagged_sidebar_entry_real_create_page (SidebarSimplePageEn
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 29 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 579 "FlaggedSidebarEntry.c"
+#line 615 "FlaggedSidebarEntry.c"
 }
 
 
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base, GeeList* media) {
+static gboolean
+library_flagged_sidebar_entry_real_internal_drop_received (SidebarInternalDropTargetEntry* base,
+                                                           GeeList* media)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gboolean result = FALSE;
 	CommandManager* _tmp0_;
 	CommandManager* _tmp1_;
-	GeeList* _tmp2_;
+	FlagUnflagCommand* _tmp2_;
 	FlagUnflagCommand* _tmp3_;
-	FlagUnflagCommand* _tmp4_;
 #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
 #line 32 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -596,26 +634,27 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received (Sideb
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	_tmp1_ = _tmp0_;
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp2_ = media;
-#line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp3_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
+	_tmp2_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (media, GEE_TYPE_COLLECTION, GeeCollection), TRUE);
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_COMMAND, Command));
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	_command_manager_unref0 (_tmp1_);
 #line 35 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	result = TRUE;
 #line 35 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 615 "FlaggedSidebarEntry.c"
+#line 651 "FlaggedSidebarEntry.c"
 }
 
 
-static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base, GtkSelectionData* data) {
+static gboolean
+library_flagged_sidebar_entry_real_internal_drop_received_arbitrary (SidebarInternalDropTargetEntry* base,
+                                                                     GtkSelectionData* data)
+{
 	LibraryFlaggedSidebarEntry * self;
 	gboolean result = FALSE;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -626,30 +665,31 @@ static gboolean library_flagged_sidebar_entry_real_internal_drop_received_arbitr
 	result = FALSE;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 630 "FlaggedSidebarEntry.c"
+#line 669 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self) {
-	gint _tmp0_;
+static void
+library_flagged_sidebar_entry_on_flagged_contents_altered (LibraryFlaggedSidebarEntry* self)
+{
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	g_return_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self));
 #line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	_tmp0_ = library_flagged_sidebar_entry_get_total_flagged (self);
-#line 43 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), _tmp0_ != 0);
-#line 642 "FlaggedSidebarEntry.c"
+	library_hideable_page_entry_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), library_flagged_sidebar_entry_get_total_flagged (self) != 0);
+#line 680 "FlaggedSidebarEntry.c"
 }
 
 
-static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self) {
+static gint
+library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSidebarEntry* self)
+{
 	gint result = 0;
 	gint total = 0;
 #line 46 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	g_return_val_if_fail (LIBRARY_IS_FLAGGED_SIDEBAR_ENTRY (self), 0);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	total = 0;
-#line 653 "FlaggedSidebarEntry.c"
+#line 693 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -678,67 +718,66 @@ static gint library_flagged_sidebar_entry_get_total_flagged (LibraryFlaggedSideb
 		_media_sources_it = _tmp5_;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
-#line 682 "FlaggedSidebarEntry.c"
+#line 722 "FlaggedSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			gint _tmp10_;
-			MediaSourceCollection* _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			gint _tmp9_;
+			MediaSourceCollection* _tmp10_;
+			GeeCollection* _tmp11_;
 			GeeCollection* _tmp12_;
-			GeeCollection* _tmp13_;
+			gint _tmp13_;
 			gint _tmp14_;
-			gint _tmp15_;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 				break;
-#line 702 "FlaggedSidebarEntry.c"
+#line 739 "FlaggedSidebarEntry.c"
 			}
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp10_ = total;
+			_tmp9_ = total;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp11_ = media_sources;
+			_tmp10_ = media_sources;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp12_ = media_source_collection_get_flagged (_tmp11_);
+			_tmp11_ = media_source_collection_get_flagged (_tmp10_);
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp13_ = _tmp12_;
+			_tmp12_ = _tmp11_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp14_ = gee_collection_get_size (_tmp13_);
+			_tmp13_ = gee_collection_get_size (_tmp12_);
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp15_ = _tmp14_;
+			_tmp14_ = _tmp13_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			total = _tmp10_ + _tmp15_;
+			total = _tmp9_ + _tmp14_;
 #line 49 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_g_object_unref0 (_tmp13_);
+			_g_object_unref0 (_tmp12_);
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 728 "FlaggedSidebarEntry.c"
+#line 765 "FlaggedSidebarEntry.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 732 "FlaggedSidebarEntry.c"
+#line 769 "FlaggedSidebarEntry.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	result = total;
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	return result;
-#line 738 "FlaggedSidebarEntry.c"
+#line 775 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntryClass * klass) {
+static void
+library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntryClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
@@ -749,30 +788,36 @@ static void library_flagged_sidebar_entry_class_init (LibraryFlaggedSidebarEntry
 	((SidebarSimplePageEntryClass *) klass)->create_page = (Page* (*) (SidebarSimplePageEntry *)) library_flagged_sidebar_entry_real_create_page;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_flagged_sidebar_entry_finalize;
-#line 753 "FlaggedSidebarEntry.c"
+#line 792 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
+static void
+library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	library_flagged_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	iface->internal_drop_received = (gboolean (*) (SidebarInternalDropTargetEntry *, GeeList*)) library_flagged_sidebar_entry_real_internal_drop_received;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*) (SidebarInternalDropTargetEntry *, GtkSelectionData*)) library_flagged_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 764 "FlaggedSidebarEntry.c"
+#line 805 "FlaggedSidebarEntry.c"
 }
 
 
-static void library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEntry * self) {
+static void
+library_flagged_sidebar_entry_instance_init (LibraryFlaggedSidebarEntry * self)
+{
 }
 
 
-static void library_flagged_sidebar_entry_finalize (GObject * obj) {
+static void
+library_flagged_sidebar_entry_finalize (GObject * obj)
+{
 	LibraryFlaggedSidebarEntry * self;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_FLAGGED_SIDEBAR_ENTRY, LibraryFlaggedSidebarEntry);
-#line 776 "FlaggedSidebarEntry.c"
+#line 821 "FlaggedSidebarEntry.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_;
@@ -801,51 +846,50 @@ static void library_flagged_sidebar_entry_finalize (GObject * obj) {
 		_media_sources_it = _tmp5_;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		while (TRUE) {
-#line 805 "FlaggedSidebarEntry.c"
+#line 850 "FlaggedSidebarEntry.c"
 			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			MediaSourceCollection* _tmp10_;
-			guint _tmp11_;
+			GeeIterator* _tmp7_;
+			gpointer _tmp8_;
+			MediaSourceCollection* _tmp9_;
+			guint _tmp10_;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_tmp6_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp6_)) {
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 				break;
-#line 821 "FlaggedSidebarEntry.c"
+#line 863 "FlaggedSidebarEntry.c"
 			}
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp8_ = _media_sources_it;
+			_tmp7_ = _media_sources_it;
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			media_sources = (MediaSourceCollection*) _tmp9_;
+			media_sources = (MediaSourceCollection*) _tmp8_;
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			_tmp10_ = media_sources;
+			_tmp9_ = media_sources;
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			g_signal_parse_name ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp11_, NULL, FALSE);
+			g_signal_parse_name ("flagged-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp10_, NULL, FALSE);
 #line 17 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
-			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self);
+			g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_flagged_sidebar_entry_on_flagged_contents_altered_media_source_collection_flagged_contents_altered, self);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 			_data_collection_unref0 (media_sources);
-#line 837 "FlaggedSidebarEntry.c"
+#line 879 "FlaggedSidebarEntry.c"
 		}
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 841 "FlaggedSidebarEntry.c"
+#line 883 "FlaggedSidebarEntry.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedSidebarEntry.vala"
 	G_OBJECT_CLASS (library_flagged_sidebar_entry_parent_class)->finalize (obj);
-#line 845 "FlaggedSidebarEntry.c"
+#line 887 "FlaggedSidebarEntry.c"
 }
 
 
-GType library_flagged_sidebar_entry_get_type (void) {
+GType
+library_flagged_sidebar_entry_get_type (void)
+{
 	static volatile gsize library_flagged_sidebar_entry_type_id__volatile = 0;
 	if (g_once_init_enter (&library_flagged_sidebar_entry_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryFlaggedSidebarEntryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_flagged_sidebar_entry_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryFlaggedSidebarEntry), 0, (GInstanceInitFunc) library_flagged_sidebar_entry_instance_init, NULL };