Merge branch 'feature/upstream' into develop

1 files changed, 247 insertions, 147 deletions

diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 16a31da..199e911 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -1,4 +1,4 @@
-/* FlaggedPage.c generated by valac 0.36.6, the Vala compiler
+/* FlaggedPage.c generated by valac 0.40.4, the Vala compiler
  * generated from FlaggedPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -251,6 +252,11 @@ typedef struct _CollectionPageCollectionSearchViewFilterClass CollectionPageColl
 
 typedef struct _FlaggedPageFlaggedSearchViewFilter FlaggedPageFlaggedSearchViewFilter;
 typedef struct _FlaggedPageFlaggedSearchViewFilterClass FlaggedPageFlaggedSearchViewFilterClass;
+enum  {
+	FLAGGED_PAGE_0_PROPERTY,
+	FLAGGED_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* flagged_page_properties[FLAGGED_PAGE_NUM_PROPERTIES];
 #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
 #define _alteration_unref0(var) ((var == NULL) ? NULL : (var = (alteration_unref (var), NULL)))
 #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
@@ -686,9 +692,15 @@ GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
 void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_injection_group (GValue* value,
+                                gpointer v_object);
+void value_take_injection_group (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_injection_group (const GValue* value);
 GType injection_group_get_type (void) G_GNUC_CONST;
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
@@ -702,17 +714,29 @@ CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (con
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self);
 gpointer view_filter_ref (gpointer instance);
 void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_view_filter (GValue* value,
+                            gpointer v_object);
+void value_take_view_filter (GValue* value,
+                             gpointer v_object);
 gpointer value_get_view_filter (const GValue* value);
 GType view_filter_get_type (void) G_GNUC_CONST;
 GType search_view_filter_get_type (void) G_GNUC_CONST;
 gpointer core_tracker_ref (gpointer instance);
 void core_tracker_unref (gpointer instance);
-GParamSpec* core_param_spec_tracker (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void core_value_set_tracker (GValue* value, gpointer v_object);
-void core_value_take_tracker (GValue* value, gpointer v_object);
+GParamSpec* core_param_spec_tracker (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void core_value_set_tracker (GValue* value,
+                             gpointer v_object);
+void core_value_take_tracker (GValue* value,
+                              gpointer v_object);
 gpointer core_value_get_tracker (const GValue* value);
 GType core_tracker_get_type (void) G_GNUC_CONST;
 GType core_view_tracker_get_type (void) G_GNUC_CONST;
@@ -724,42 +748,62 @@ GType collection_page_get_type (void) G_GNUC_CONST;
 GType flagged_page_get_type (void) G_GNUC_CONST;
 gpointer view_manager_ref (gpointer instance);
 void view_manager_unref (gpointer instance);
-GParamSpec* param_spec_view_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_manager (GValue* value, gpointer v_object);
-void value_take_view_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_manager (const gchar* name,
+                                     const gchar* nick,
+                                     const gchar* blurb,
+                                     GType object_type,
+                                     GParamFlags flags);
+void value_set_view_manager (GValue* value,
+                             gpointer v_object);
+void value_take_view_manager (GValue* value,
+                              gpointer v_object);
 gpointer value_get_view_manager (const GValue* value);
 GType view_manager_get_type (void) G_GNUC_CONST;
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 GType default_search_view_filter_get_type (void) G_GNUC_CONST;
 GType collection_page_collection_search_view_filter_get_type (void) G_GNUC_CONST;
 static GType flagged_page_flagged_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define FLAGGED_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_FLAGGED_PAGE, FlaggedPagePrivate))
-enum  {
-	FLAGGED_PAGE_DUMMY_PROPERTY
-};
-Alteration* alteration_new (const gchar* subject, const gchar* detail);
-Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail);
+Alteration* alteration_new (const gchar* subject,
+                            const gchar* detail);
+Alteration* alteration_construct (GType object_type,
+                                  const gchar* subject,
+                                  const gchar* detail);
 static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void);
 static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_construct (GType object_type);
 #define FLAGGED_PAGE_NAME _ ("Flagged")
 FlaggedPage* flagged_page_new (void);
 FlaggedPage* flagged_page_construct (GType object_type);
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
+CollectionPage* collection_page_construct (GType object_type,
+                                           const gchar* page_name);
 static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner);
-static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner);
+static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type,
+                                                                            FlaggedPage* owner);
 GType collection_view_manager_get_type (void) G_GNUC_CONST;
 static GType flagged_page_flagged_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
@@ -767,9 +811,15 @@ GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 gpointer media_collection_registry_ref (gpointer instance);
 void media_collection_registry_unref (gpointer instance);
-GParamSpec* param_spec_media_collection_registry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_media_collection_registry (GValue* value, gpointer v_object);
-void value_take_media_collection_registry (GValue* value, gpointer v_object);
+GParamSpec* param_spec_media_collection_registry (const gchar* name,
+                                                  const gchar* nick,
+                                                  const gchar* blurb,
+                                                  GType object_type,
+                                                  GParamFlags flags);
+void value_set_media_collection_registry (GValue* value,
+                                          gpointer v_object);
+void value_take_media_collection_registry (GValue* value,
+                                           gpointer v_object);
 gpointer value_get_media_collection_registry (const GValue* value);
 GType media_collection_registry_get_type (void) G_GNUC_CONST;
 MediaCollectionRegistry* media_collection_registry_get_instance (void);
@@ -778,33 +828,49 @@ GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 gpointer view_collection_monitor_ref (gpointer instance);
 void view_collection_monitor_unref (gpointer instance);
-GParamSpec* view_collection_param_spec_monitor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void view_collection_value_set_monitor (GValue* value, gpointer v_object);
-void view_collection_value_take_monitor (GValue* value, gpointer v_object);
+GParamSpec* view_collection_param_spec_monitor (const gchar* name,
+                                                const gchar* nick,
+                                                const gchar* blurb,
+                                                GType object_type,
+                                                GParamFlags flags);
+void view_collection_value_set_monitor (GValue* value,
+                                        gpointer v_object);
+void view_collection_value_take_monitor (GValue* value,
+                                         gpointer v_object);
 gpointer view_collection_value_get_monitor (const GValue* value);
 GType view_collection_monitor_get_type (void) G_GNUC_CONST;
-ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self, SourceCollection* sources, ViewManager* manager, Alteration* prereq, GeeCollection* initial, ProgressMonitor progress_monitor, void* progress_monitor_target);
-static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by);
+ViewCollectionMonitor* view_collection_monitor_source_collection (ViewCollection* self,
+                                                                  SourceCollection* sources,
+                                                                  ViewManager* manager,
+                                                                  Alteration* prereq,
+                                                                  GeeCollection* initial,
+                                                                  ProgressMonitor progress_monitor,
+                                                                  void* progress_monitor_target);
+static void flagged_page_real_get_config_photos_sort (MediaPage* base,
+                                               gboolean* sort_order,
+                                               gint* sort_by);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
-void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by);
-static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by);
-void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by);
+void configuration_facade_get_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean* sort_order,
+                                                   gint* sort_by);
+static void flagged_page_real_set_config_photos_sort (MediaPage* base,
+                                               gboolean sort_order,
+                                               gint sort_by);
+void configuration_facade_set_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean sort_order,
+                                                   gint sort_by);
 static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base);
-enum  {
-	FLAGGED_PAGE_FLAGGED_VIEW_MANAGER_DUMMY_PROPERTY
-};
 CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
-static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, DataSource* source);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+                                                          CollectionPage* page);
+static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base,
+                                                                 DataSource* source);
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
-enum  {
-	FLAGGED_PAGE_FLAGGED_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
 static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void);
@@ -812,7 +878,9 @@ CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view
 static void flagged_page_finalize (GObject * obj);
 
 
-FlaggedPage* flagged_page_construct (GType object_type) {
+FlaggedPage*
+flagged_page_construct (GType object_type)
+{
 	FlaggedPage * self = NULL;
 	FlaggedPageFlaggedViewManager* _tmp0_;
 #line 34 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -823,7 +891,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 	_view_manager_unref0 (self->priv->view_manager);
 #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->view_manager = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 827 "FlaggedPage.c"
+#line 895 "FlaggedPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp1_;
@@ -852,75 +920,78 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 		_sources_it = _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		while (TRUE) {
-#line 856 "FlaggedPage.c"
+#line 924 "FlaggedPage.c"
 			GeeIterator* _tmp7_;
-			gboolean _tmp8_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp9_;
-			gpointer _tmp10_;
+			GeeIterator* _tmp8_;
+			gpointer _tmp9_;
+			ViewCollection* _tmp10_;
 			ViewCollection* _tmp11_;
-			ViewCollection* _tmp12_;
-			MediaSourceCollection* _tmp13_;
-			ViewManager* _tmp14_;
-			Alteration* _tmp15_;
+			MediaSourceCollection* _tmp12_;
+			ViewManager* _tmp13_;
+			Alteration* _tmp14_;
+			ViewCollectionMonitor* _tmp15_;
 			ViewCollectionMonitor* _tmp16_;
-			ViewCollectionMonitor* _tmp17_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_tmp7_ = _sources_it;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			if (!_tmp8_) {
+			if (!gee_iterator_next (_tmp7_)) {
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 				break;
-#line 877 "FlaggedPage.c"
+#line 942 "FlaggedPage.c"
 			}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp9_ = _sources_it;
+			_tmp8_ = _sources_it;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp10_ = gee_iterator_get (_tmp9_);
+			_tmp9_ = gee_iterator_get (_tmp8_);
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			sources = (MediaSourceCollection*) _tmp10_;
+			sources = (MediaSourceCollection*) _tmp9_;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp12_ = _tmp11_;
+			_tmp11_ = _tmp10_;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp13_ = sources;
+			_tmp12_ = sources;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp14_ = self->priv->view_manager;
+			_tmp13_ = self->priv->view_manager;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp15_ = self->priv->prereq;
+			_tmp14_ = self->priv->prereq;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp16_ = view_collection_monitor_source_collection (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp14_, _tmp15_, NULL, NULL, NULL);
+			_tmp15_ = view_collection_monitor_source_collection (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_, _tmp14_, NULL, NULL, NULL);
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_tmp17_ = _tmp16_;
+			_tmp16_ = _tmp15_;
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_view_collection_monitor_unref0 (_tmp17_);
+			_view_collection_monitor_unref0 (_tmp16_);
 #line 39 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-			_data_collection_unref0 (_tmp12_);
+			_data_collection_unref0 (_tmp11_);
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_data_collection_unref0 (sources);
-#line 905 "FlaggedPage.c"
+#line 970 "FlaggedPage.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 909 "FlaggedPage.c"
+#line 974 "FlaggedPage.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 913 "FlaggedPage.c"
+#line 978 "FlaggedPage.c"
 }
 
 
-FlaggedPage* flagged_page_new (void) {
+FlaggedPage*
+flagged_page_new (void)
+{
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_construct (TYPE_FLAGGED_PAGE);
-#line 920 "FlaggedPage.c"
+#line 987 "FlaggedPage.c"
 }
 
 
-static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+flagged_page_real_get_config_photos_sort (MediaPage* base,
+                                          gboolean* sort_order,
+                                          gint* sort_by)
+{
 	FlaggedPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -946,23 +1017,25 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	if (sort_order) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_order = _vala_sort_order;
-#line 950 "FlaggedPage.c"
+#line 1021 "FlaggedPage.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (sort_by) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_by = _vala_sort_by;
-#line 956 "FlaggedPage.c"
+#line 1027 "FlaggedPage.c"
 	}
 }
 
 
-static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+flagged_page_real_set_config_photos_sort (MediaPage* base,
+                                          gboolean sort_order,
+                                          gint sort_by)
+{
 	FlaggedPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 46 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLAGGED_PAGE, FlaggedPage);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -970,25 +1043,25 @@ static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_tmp1_ = _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp2_ = sort_order;
-#line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp3_ = sort_by;
-#line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
+	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), sort_order, sort_by);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 981 "FlaggedPage.c"
+#line 1050 "FlaggedPage.c"
 }
 
 
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 988 "FlaggedPage.c"
+#line 1059 "FlaggedPage.c"
 }
 
 
-static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+flagged_page_real_get_search_view_filter (CheckerboardPage* base)
+{
 	FlaggedPage * self;
 	SearchViewFilter* result = NULL;
 	FlaggedPageFlaggedSearchViewFilter* _tmp0_;
@@ -1003,100 +1076,107 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP
 	result = _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1007 "FlaggedPage.c"
+#line 1080 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construct (GType object_type, FlaggedPage* owner) {
+static FlaggedPageFlaggedViewManager*
+flagged_page_flagged_view_manager_construct (GType object_type,
+                                             FlaggedPage* owner)
+{
 	FlaggedPageFlaggedViewManager* self = NULL;
-	FlaggedPage* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_return_val_if_fail (IS_FLAGGED_PAGE (owner), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp0_ = owner;
-#line 12 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
+	self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1022 "FlaggedPage.c"
+#line 1095 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner) {
+static FlaggedPageFlaggedViewManager*
+flagged_page_flagged_view_manager_new (FlaggedPage* owner)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_view_manager_construct (FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, owner);
-#line 1029 "FlaggedPage.c"
+#line 1104 "FlaggedPage.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1036 "FlaggedPage.c"
+#line 1113 "FlaggedPage.c"
 }
 
 
-static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base, DataSource* source) {
+static gboolean
+flagged_page_flagged_view_manager_real_include_in_view (ViewManager* base,
+                                                        DataSource* source)
+{
 	FlaggedPageFlaggedViewManager * self;
 	gboolean result = FALSE;
 	Flaggable* flaggable = NULL;
-	DataSource* _tmp0_;
-	Flaggable* _tmp1_;
-	gboolean _tmp2_ = FALSE;
-	Flaggable* _tmp3_;
+	Flaggable* _tmp0_;
+	gboolean _tmp1_ = FALSE;
+	Flaggable* _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, FlaggedPageFlaggedViewManager);
 #line 15 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp0_ = source;
-#line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp0_) : NULL);
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_FLAGGABLE) ? ((Flaggable*) source) : NULL);
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	flaggable = _tmp1_;
+	flaggable = _tmp0_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	_tmp3_ = flaggable;
+	_tmp2_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	if (_tmp3_ != NULL) {
-#line 1062 "FlaggedPage.c"
-		Flaggable* _tmp4_;
-		gboolean _tmp5_;
+	if (_tmp2_ != NULL) {
+#line 1139 "FlaggedPage.c"
+		Flaggable* _tmp3_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp4_ = flaggable;
+		_tmp3_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp5_ = flaggable_is_flagged (_tmp4_);
-#line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp2_ = _tmp5_;
-#line 1071 "FlaggedPage.c"
+		_tmp1_ = flaggable_is_flagged (_tmp3_);
+#line 1145 "FlaggedPage.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-		_tmp2_ = FALSE;
-#line 1075 "FlaggedPage.c"
+		_tmp1_ = FALSE;
+#line 1149 "FlaggedPage.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_g_object_unref0 (flaggable);
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1083 "FlaggedPage.c"
+#line 1157 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedViewManagerClass * klass) {
+static void
+flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedViewManagerClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) flagged_page_flagged_view_manager_real_include_in_view;
-#line 1092 "FlaggedPage.c"
+#line 1168 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_view_manager_instance_init (FlaggedPageFlaggedViewManager * self) {
+static void
+flagged_page_flagged_view_manager_instance_init (FlaggedPageFlaggedViewManager * self)
+{
 }
 
 
-static GType flagged_page_flagged_view_manager_get_type (void) {
+static GType
+flagged_page_flagged_view_manager_get_type (void)
+{
 	static volatile gsize flagged_page_flagged_view_manager_type_id__volatile = 0;
 	if (g_once_init_enter (&flagged_page_flagged_view_manager_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageFlaggedViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_flagged_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPageFlaggedViewManager), 0, (GInstanceInitFunc) flagged_page_flagged_view_manager_instance_init, NULL };
@@ -1108,7 +1188,9 @@ static GType flagged_page_flagged_view_manager_get_type (void) {
 }
 
 
-static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+flagged_page_flagged_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
 	FlaggedPageFlaggedSearchViewFilter * self;
 	guint result = 0U;
 #line 23 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1117,41 +1199,51 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) (((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 24 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1121 "FlaggedPage.c"
+#line 1203 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_construct (GType object_type) {
+static FlaggedPageFlaggedSearchViewFilter*
+flagged_page_flagged_search_view_filter_construct (GType object_type)
+{
 	FlaggedPageFlaggedSearchViewFilter* self = NULL;
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = (FlaggedPageFlaggedSearchViewFilter*) collection_page_collection_search_view_filter_construct (object_type);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1131 "FlaggedPage.c"
+#line 1215 "FlaggedPage.c"
 }
 
 
-static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void) {
+static FlaggedPageFlaggedSearchViewFilter*
+flagged_page_flagged_search_view_filter_new (void)
+{
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_search_view_filter_construct (FLAGGED_PAGE_TYPE_FLAGGED_SEARCH_VIEW_FILTER);
-#line 1138 "FlaggedPage.c"
+#line 1224 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlaggedSearchViewFilterClass * klass) {
+static void
+flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlaggedSearchViewFilterClass * klass)
+{
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) flagged_page_flagged_search_view_filter_real_get_criteria;
-#line 1147 "FlaggedPage.c"
+#line 1235 "FlaggedPage.c"
 }
 
 
-static void flagged_page_flagged_search_view_filter_instance_init (FlaggedPageFlaggedSearchViewFilter * self) {
+static void
+flagged_page_flagged_search_view_filter_instance_init (FlaggedPageFlaggedSearchViewFilter * self)
+{
 }
 
 
-static GType flagged_page_flagged_search_view_filter_get_type (void) {
+static GType
+flagged_page_flagged_search_view_filter_get_type (void)
+{
 	static volatile gsize flagged_page_flagged_search_view_filter_type_id__volatile = 0;
 	if (g_once_init_enter (&flagged_page_flagged_search_view_filter_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageFlaggedSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_flagged_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPageFlaggedSearchViewFilter), 0, (GInstanceInitFunc) flagged_page_flagged_search_view_filter_instance_init, NULL };
@@ -1163,7 +1255,9 @@ static GType flagged_page_flagged_search_view_filter_get_type (void) {
 }
 
 
-static void flagged_page_class_init (FlaggedPageClass * klass) {
+static void
+flagged_page_class_init (FlaggedPageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	flagged_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1176,11 +1270,13 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) flagged_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize;
-#line 1180 "FlaggedPage.c"
+#line 1274 "FlaggedPage.c"
 }
 
 
-static void flagged_page_instance_init (FlaggedPage * self) {
+static void
+flagged_page_instance_init (FlaggedPage * self)
+{
 	Alteration* _tmp0_;
 	FlaggedPageFlaggedSearchViewFilter* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1193,11 +1289,13 @@ static void flagged_page_instance_init (FlaggedPage * self) {
 	_tmp1_ = flagged_page_flagged_search_view_filter_new ();
 #line 31 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->search_filter = _tmp1_;
-#line 1197 "FlaggedPage.c"
+#line 1293 "FlaggedPage.c"
 }
 
 
-static void flagged_page_finalize (GObject * obj) {
+static void
+flagged_page_finalize (GObject * obj)
+{
 	FlaggedPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLAGGED_PAGE, FlaggedPage);
@@ -1209,11 +1307,13 @@ static void flagged_page_finalize (GObject * obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (flagged_page_parent_class)->finalize (obj);
-#line 1213 "FlaggedPage.c"
+#line 1311 "FlaggedPage.c"
 }
 
 
-GType flagged_page_get_type (void) {
+GType
+flagged_page_get_type (void)
+{
 	static volatile gsize flagged_page_type_id__volatile = 0;
 	if (g_once_init_enter (&flagged_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FlaggedPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) flagged_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FlaggedPage), 0, (GInstanceInitFunc) flagged_page_instance_init, NULL };