New upstream version 0.28.3upstream/0.28.3

1 files changed, 245 insertions, 162 deletions

diff --git a/src/folders/FoldersPage.c b/src/folders/FoldersPage.c
index abc3f83..095b114 100644
--- a/src/folders/FoldersPage.c
+++ b/src/folders/FoldersPage.c
@@ -1,4 +1,4 @@
-/* FoldersPage.c generated by valac 0.36.6, the Vala compiler
+/* FoldersPage.c generated by valac 0.40.4, the Vala compiler
  * generated from FoldersPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -230,6 +231,11 @@ typedef struct _CollectionViewManagerClass CollectionViewManagerClass;
 
 typedef struct _FoldersPageFolderViewManager FoldersPageFolderViewManager;
 typedef struct _FoldersPageFolderViewManagerClass FoldersPageFolderViewManagerClass;
+enum  {
+	FOLDERS_PAGE_0_PROPERTY,
+	FOLDERS_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* folders_page_properties[FOLDERS_PAGE_NUM_PROPERTIES];
 #define _view_manager_unref0(var) ((var == NULL) ? NULL : (var = (view_manager_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 
@@ -569,9 +575,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;
@@ -585,17 +597,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;
@@ -607,27 +631,41 @@ GType collection_page_get_type (void) G_GNUC_CONST;
 GType folders_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;
 GType collection_view_manager_get_type (void) G_GNUC_CONST;
 static GType folders_page_folder_view_manager_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define FOLDERS_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), FOLDERS_TYPE_PAGE, FoldersPagePrivate))
-enum  {
-	FOLDERS_PAGE_DUMMY_PROPERTY
-};
 FoldersPage* folders_page_new (GFile* dir);
-FoldersPage* folders_page_construct (GType object_type, GFile* dir);
-CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
-static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir);
-static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, FoldersPage* owner, GFile* dir);
+FoldersPage* folders_page_construct (GType object_type,
+                                     GFile* dir);
+CollectionPage* collection_page_construct (GType object_type,
+                                           const gchar* page_name);
+static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner,
+                                                                    GFile* dir);
+static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type,
+                                                                          FoldersPage* owner,
+                                                                          GFile* dir);
 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;
@@ -635,9 +673,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);
@@ -646,32 +690,57 @@ GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 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 folders_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 folders_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 folders_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);
-enum  {
-	FOLDERS_PAGE_FOLDER_VIEW_MANAGER_DUMMY_PROPERTY
-};
+void configuration_facade_get_library_photos_sort (ConfigurationFacade* self,
+                                                   gboolean* sort_order,
+                                                   gint* sort_by);
+static void folders_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);
 CollectionViewManager* collection_view_manager_new (CollectionPage* page);
-CollectionViewManager* collection_view_manager_construct (GType object_type, CollectionPage* page);
-static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, DataSource* source);
+CollectionViewManager* collection_view_manager_construct (GType object_type,
+                                                          CollectionPage* page);
+static gboolean folders_page_folder_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;
 GFile* media_source_get_file (MediaSource* self);
@@ -679,128 +748,128 @@ static void folders_page_folder_view_manager_finalize (ViewManager * obj);
 static void folders_page_finalize (GObject * obj);
 
 
-FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
+FoldersPage*
+folders_page_construct (GType object_type,
+                        GFile* dir)
+{
 	FoldersPage * self = NULL;
-	GFile* _tmp0_;
+	gchar* _tmp0_;
 	gchar* _tmp1_;
-	gchar* _tmp2_;
-	GFile* _tmp3_;
-	FoldersPageFolderViewManager* _tmp4_;
+	FoldersPageFolderViewManager* _tmp2_;
 #line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
 #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp0_ = dir;
+	_tmp0_ = g_file_get_path (dir);
 #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp1_ = g_file_get_path (_tmp0_);
-#line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	self = (FoldersPage*) collection_page_construct (object_type, _tmp2_);
+	self = (FoldersPage*) collection_page_construct (object_type, _tmp1_);
 #line 25 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_g_free0 (_tmp2_);
+	_g_free0 (_tmp1_);
 #line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp3_ = dir;
-#line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp4_ = folders_page_folder_view_manager_new (self, _tmp3_);
+	_tmp2_ = folders_page_folder_view_manager_new (self, dir);
 #line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_view_manager_unref0 (self->priv->view_manager);
 #line 27 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	self->priv->view_manager = _tmp4_;
-#line 710 "FoldersPage.c"
+	self->priv->view_manager = _tmp2_;
+#line 776 "FoldersPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
-		MediaCollectionRegistry* _tmp5_;
-		MediaCollectionRegistry* _tmp6_;
-		GeeCollection* _tmp7_;
-		GeeCollection* _tmp8_;
-		GeeIterator* _tmp9_;
-		GeeIterator* _tmp10_;
+		MediaCollectionRegistry* _tmp3_;
+		MediaCollectionRegistry* _tmp4_;
+		GeeCollection* _tmp5_;
+		GeeCollection* _tmp6_;
+		GeeIterator* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_tmp5_ = media_collection_registry_get_instance ();
+		_tmp3_ = media_collection_registry_get_instance ();
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_tmp7_ = media_collection_registry_get_all (_tmp6_);
+		_tmp5_ = media_collection_registry_get_all (_tmp4_);
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp8_ = _tmp7_;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp6_);
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_media_collection_registry_unref0 (_tmp6_);
+		_media_collection_registry_unref0 (_tmp4_);
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-		_sources_it = _tmp10_;
+		_sources_it = _tmp8_;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		while (TRUE) {
-#line 739 "FoldersPage.c"
-			GeeIterator* _tmp11_;
-			gboolean _tmp12_;
+#line 805 "FoldersPage.c"
+			GeeIterator* _tmp9_;
 			MediaSourceCollection* sources = NULL;
-			GeeIterator* _tmp13_;
-			gpointer _tmp14_;
-			ViewCollection* _tmp15_;
-			ViewCollection* _tmp16_;
-			MediaSourceCollection* _tmp17_;
-			FoldersPageFolderViewManager* _tmp18_;
-			ViewCollectionMonitor* _tmp19_;
-			ViewCollectionMonitor* _tmp20_;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			ViewCollection* _tmp12_;
+			ViewCollection* _tmp13_;
+			MediaSourceCollection* _tmp14_;
+			FoldersPageFolderViewManager* _tmp15_;
+			ViewCollectionMonitor* _tmp16_;
+			ViewCollectionMonitor* _tmp17_;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp11_ = _sources_it;
+			_tmp9_ = _sources_it;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp12_ = gee_iterator_next (_tmp11_);
-#line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			if (!_tmp12_) {
+			if (!gee_iterator_next (_tmp9_)) {
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 				break;
-#line 759 "FoldersPage.c"
+#line 822 "FoldersPage.c"
 			}
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp13_ = _sources_it;
+			_tmp10_ = _sources_it;
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp14_ = gee_iterator_get (_tmp13_);
+			_tmp11_ = gee_iterator_get (_tmp10_);
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			sources = (MediaSourceCollection*) _tmp14_;
+			sources = (MediaSourceCollection*) _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp16_ = _tmp15_;
+			_tmp13_ = _tmp12_;
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp17_ = sources;
+			_tmp14_ = sources;
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp18_ = self->priv->view_manager;
+			_tmp15_ = self->priv->view_manager;
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp19_ = view_collection_monitor_source_collection (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
+			_tmp16_ = view_collection_monitor_source_collection (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SOURCE_COLLECTION, SourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_VIEW_MANAGER, ViewManager), NULL, NULL, NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_tmp20_ = _tmp19_;
+			_tmp17_ = _tmp16_;
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_view_collection_monitor_unref0 (_tmp20_);
+			_view_collection_monitor_unref0 (_tmp17_);
 #line 30 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-			_data_collection_unref0 (_tmp16_);
+			_data_collection_unref0 (_tmp13_);
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 			_data_collection_unref0 (sources);
-#line 785 "FoldersPage.c"
+#line 848 "FoldersPage.c"
 		}
 #line 29 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 789 "FoldersPage.c"
+#line 852 "FoldersPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return self;
-#line 793 "FoldersPage.c"
+#line 856 "FoldersPage.c"
 }
 
 
-FoldersPage* folders_page_new (GFile* dir) {
+FoldersPage*
+folders_page_new (GFile* dir)
+{
 #line 24 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return folders_page_construct (FOLDERS_TYPE_PAGE, dir);
-#line 800 "FoldersPage.c"
+#line 865 "FoldersPage.c"
 }
 
 
-static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean* sort_order, gint* sort_by) {
+static void
+folders_page_real_get_config_photos_sort (MediaPage* base,
+                                          gboolean* sort_order,
+                                          gint* sort_by)
+{
 	FoldersPage * self;
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
@@ -826,23 +895,25 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	if (sort_order) {
 #line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		*sort_order = _vala_sort_order;
-#line 830 "FoldersPage.c"
+#line 899 "FoldersPage.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	if (sort_by) {
 #line 33 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 		*sort_by = _vala_sort_by;
-#line 836 "FoldersPage.c"
+#line 905 "FoldersPage.c"
 	}
 }
 
 
-static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by) {
+static void
+folders_page_real_set_config_photos_sort (MediaPage* base,
+                                          gboolean sort_order,
+                                          gint sort_by)
+{
 	FoldersPage * self;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gboolean _tmp2_;
-	gint _tmp3_;
 #line 37 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_PAGE, FoldersPage);
 #line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
@@ -850,109 +921,111 @@ static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean
 #line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_tmp1_ = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp2_ = sort_order;
-#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp3_ = sort_by;
-#line 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.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 38 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 861 "FoldersPage.c"
+#line 928 "FoldersPage.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 868 "FoldersPage.c"
+#line 937 "FoldersPage.c"
 }
 
 
-static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct (GType object_type, FoldersPage* owner, GFile* dir) {
+static FoldersPageFolderViewManager*
+folders_page_folder_view_manager_construct (GType object_type,
+                                            FoldersPage* owner,
+                                            GFile* dir)
+{
 	FoldersPageFolderViewManager* self = NULL;
-	FoldersPage* _tmp0_;
-	GFile* _tmp1_;
-	GFile* _tmp2_;
+	GFile* _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (FOLDERS_IS_PAGE (owner), NULL);
 #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
 #line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp0_ = owner;
-#line 12 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	self = (FoldersPageFolderViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
+	self = (FoldersPageFolderViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp1_ = dir;
-#line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp0_ = _g_object_ref0 (dir);
 #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	_g_object_unref0 (self->dir);
 #line 14 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	self->dir = _tmp2_;
+	self->dir = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return self;
-#line 895 "FoldersPage.c"
+#line 962 "FoldersPage.c"
 }
 
 
-static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir) {
+static FoldersPageFolderViewManager*
+folders_page_folder_view_manager_new (FoldersPage* owner,
+                                      GFile* dir)
+{
 #line 11 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return folders_page_folder_view_manager_construct (FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, owner, dir);
-#line 902 "FoldersPage.c"
+#line 972 "FoldersPage.c"
 }
 
 
-static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManager* base, DataSource* source) {
+static gboolean
+folders_page_folder_view_manager_real_include_in_view (ViewManager* base,
+                                                       DataSource* source)
+{
 	FoldersPageFolderViewManager * self;
 	gboolean result = FALSE;
-	DataSource* _tmp0_;
+	GFile* _tmp0_;
 	GFile* _tmp1_;
 	GFile* _tmp2_;
-	GFile* _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
+	gboolean _tmp3_;
 #line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager);
 #line 17 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp0_ = source;
-#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_MEDIA_SOURCE, MediaSource));
 #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp3_ = self->dir;
+	_tmp1_ = _tmp0_;
 #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp4_ = g_file_has_prefix (_tmp2_, _tmp3_);
+	_tmp2_ = self->dir;
 #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = g_file_has_prefix (_tmp1_, _tmp2_);
 #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
-	result = _tmp5_;
+	result = _tmp3_;
 #line 18 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	return result;
-#line 937 "FoldersPage.c"
+#line 1004 "FoldersPage.c"
 }
 
 
-static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewManagerClass * klass) {
+static void
+folders_page_folder_view_manager_class_init (FoldersPageFolderViewManagerClass * klass)
+{
 #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	folders_page_folder_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize;
 #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = (gboolean (*) (ViewManager *, DataSource*)) folders_page_folder_view_manager_real_include_in_view;
-#line 948 "FoldersPage.c"
+#line 1017 "FoldersPage.c"
 }
 
 
-static void folders_page_folder_view_manager_instance_init (FoldersPageFolderViewManager * self) {
+static void
+folders_page_folder_view_manager_instance_init (FoldersPageFolderViewManager * self)
+{
 }
 
 
-static void folders_page_folder_view_manager_finalize (ViewManager * obj) {
+static void
+folders_page_folder_view_manager_finalize (ViewManager * obj)
+{
 	FoldersPageFolderViewManager * self;
 #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, FoldersPageFolderViewManager);
@@ -960,11 +1033,13 @@ static void folders_page_folder_view_manager_finalize (ViewManager * obj) {
 	_g_object_unref0 (self->dir);
 #line 8 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	VIEW_MANAGER_CLASS (folders_page_folder_view_manager_parent_class)->finalize (obj);
-#line 964 "FoldersPage.c"
+#line 1037 "FoldersPage.c"
 }
 
 
-static GType folders_page_folder_view_manager_get_type (void) {
+static GType
+folders_page_folder_view_manager_get_type (void)
+{
 	static volatile gsize folders_page_folder_view_manager_type_id__volatile = 0;
 	if (g_once_init_enter (&folders_page_folder_view_manager_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FoldersPageFolderViewManagerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_page_folder_view_manager_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersPageFolderViewManager), 0, (GInstanceInitFunc) folders_page_folder_view_manager_instance_init, NULL };
@@ -976,7 +1051,9 @@ static GType folders_page_folder_view_manager_get_type (void) {
 }
 
 
-static void folders_page_class_init (FoldersPageClass * klass) {
+static void
+folders_page_class_init (FoldersPageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	folders_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
@@ -987,18 +1064,22 @@ static void folders_page_class_init (FoldersPageClass * klass) {
 	((MediaPageClass *) klass)->set_config_photos_sort = (void (*) (MediaPage *, gboolean, gint)) folders_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_page_finalize;
-#line 991 "FoldersPage.c"
+#line 1068 "FoldersPage.c"
 }
 
 
-static void folders_page_instance_init (FoldersPage * self) {
+static void
+folders_page_instance_init (FoldersPage * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self->priv = FOLDERS_PAGE_GET_PRIVATE (self);
-#line 998 "FoldersPage.c"
+#line 1077 "FoldersPage.c"
 }
 
 
-static void folders_page_finalize (GObject * obj) {
+static void
+folders_page_finalize (GObject * obj)
+{
 	FoldersPage * self;
 #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_PAGE, FoldersPage);
@@ -1006,11 +1087,13 @@ static void folders_page_finalize (GObject * obj) {
 	_view_manager_unref0 (self->priv->view_manager);
 #line 7 "/home/jens/Source/shotwell/src/folders/FoldersPage.vala"
 	G_OBJECT_CLASS (folders_page_parent_class)->finalize (obj);
-#line 1010 "FoldersPage.c"
+#line 1091 "FoldersPage.c"
 }
 
 
-GType folders_page_get_type (void) {
+GType
+folders_page_get_type (void)
+{
 	static volatile gsize folders_page_type_id__volatile = 0;
 	if (g_once_init_enter (&folders_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (FoldersPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) folders_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (FoldersPage), 0, (GInstanceInitFunc) folders_page_instance_init, NULL };