New upstream version 0.28.3upstream/0.28.3

1 files changed, 449 insertions, 348 deletions

diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index b3a06a0..3d18c3f 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.36.6, the Vala compiler
+/* OfflinePage.c generated by valac 0.40.4, the Vala compiler
  * generated from OfflinePage.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>
@@ -199,6 +200,11 @@ typedef struct _OfflinePageOfflineSearchViewFilterClass OfflinePageOfflineSearch
 
 typedef struct _MediaViewTracker MediaViewTracker;
 typedef struct _MediaViewTrackerClass MediaViewTrackerClass;
+enum  {
+	OFFLINE_PAGE_0_PROPERTY,
+	OFFLINE_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* offline_page_properties[OFFLINE_PAGE_NUM_PROPERTIES];
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -431,6 +437,11 @@ typedef struct _Dimensions Dimensions;
 typedef struct _MediaSourceItemPrivate MediaSourceItemPrivate;
 typedef struct _ThumbnailPrivate ThumbnailPrivate;
 typedef struct _OfflinePageOfflineViewPrivate OfflinePageOfflineViewPrivate;
+enum  {
+	OFFLINE_PAGE_OFFLINE_VIEW_0_PROPERTY,
+	OFFLINE_PAGE_OFFLINE_VIEW_NUM_PROPERTIES
+};
+static GParamSpec* offline_page_offline_view_properties[OFFLINE_PAGE_OFFLINE_VIEW_NUM_PROPERTIES];
 typedef struct _ViewFilterPrivate ViewFilterPrivate;
 typedef struct _SearchViewFilterPrivate SearchViewFilterPrivate;
 typedef struct _DefaultSearchViewFilterPrivate DefaultSearchViewFilterPrivate;
@@ -723,9 +734,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;
@@ -739,17 +756,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;
@@ -758,14 +787,17 @@ GType default_search_view_filter_get_type (void) G_GNUC_CONST;
 static GType offline_page_offline_search_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType media_view_tracker_get_type (void) G_GNUC_CONST;
 #define OFFLINE_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_OFFLINE_PAGE, OfflinePagePrivate))
-enum  {
-	OFFLINE_PAGE_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;
@@ -775,85 +807,135 @@ GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
-static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed);
-static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self);
+static void offline_page_on_offline_contents_altered (OfflinePage* self,
+                                               GeeCollection* added,
+                                               GeeCollection* removed);
+static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                                 GeeCollection* added,
+                                                                                                 GeeCollection* removed,
+                                                                                                 gpointer self);
 GType video_source_collection_get_type (void) G_GNUC_CONST;
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void);
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type);
 #define OFFLINE_PAGE_NAME _ ("Missing Files")
 static void offline_page_on_remove_from_library (OfflinePage* self);
-static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
 OfflinePage* offline_page_new (void);
 OfflinePage* offline_page_construct (GType object_type);
-CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
-void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path);
-void page_init_toolbar (Page* self, const gchar* path);
+CheckerboardPage* checkerboard_page_construct (GType object_type,
+                                               const gchar* page_name);
+void checkerboard_page_init_item_context_menu (CheckerboardPage* self,
+                                               const gchar* path);
+void page_init_toolbar (Page* self,
+                        const gchar* path);
 GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 MediaViewTracker* media_view_tracker_new (ViewCollection* collection);
-MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollection* collection);
+MediaViewTracker* media_view_tracker_construct (GType object_type,
+                                                ViewCollection* collection);
 GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self);
-static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void offline_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-static void offline_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
+static void offline_page_real_init_collect_ui_filenames (Page* base,
+                                                  GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void offline_page_real_add_actions (Page* base,
+                                    GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+static void offline_page_real_remove_actions (Page* base,
+                                       GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
 static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base);
-static void offline_page_real_update_actions (Page* base, gint selected_count, gint count);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_update_actions (Page* self, gint selected_count, gint count);
-gboolean data_collection_add (DataCollection* self, DataObject* object);
+static void offline_page_real_update_actions (Page* base,
+                                       gint selected_count,
+                                       gint count);
+void page_set_action_sensitive (Page* self,
+                                const gchar* name,
+                                gboolean sensitive);
+void page_update_actions (Page* self,
+                          gint selected_count,
+                          gint count);
+gboolean data_collection_add (DataCollection* self,
+                              DataObject* object);
 static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source);
-static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source);
+static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type,
+                                                             MediaSource* source);
 GType media_source_item_get_type (void) G_GNUC_CONST;
 GType thumbnail_get_type (void) G_GNUC_CONST;
 static GType offline_page_offline_view_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType marker_get_type (void) G_GNUC_CONST;
 Marker* data_collection_start_marking (DataCollection* self);
-void marker_mark (Marker* self, DataObject* object);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
-void data_collection_remove_marked (DataCollection* self, Marker* m);
+void marker_mark (Marker* self,
+                  DataObject* object);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+                                               DataSource* source);
+void data_collection_remove_marked (DataCollection* self,
+                                    Marker* m);
 GeeList* view_collection_get_selected_sources (ViewCollection* self);
-gboolean remove_offline_dialog (GtkWindow* owner, gint count);
+gboolean remove_offline_dialog (GtkWindow* owner,
+                                gint count);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 void page_window_set_busy_cursor (PageWindow* self);
 GType progress_dialog_get_type (void) G_GNUC_CONST;
-ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
-ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
+ProgressDialog* progress_dialog_new (GtkWindow* owner,
+                                     const gchar* text,
+                                     GCancellable* cancellable);
+ProgressDialog* progress_dialog_construct (GType object_type,
+                                           GtkWindow* owner,
+                                           const gchar* text,
+                                           GCancellable* cancellable);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 GType library_photo_get_type (void) G_GNUC_CONST;
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
-void media_source_collection_filter_media (GeeCollection* media, GeeCollection* photos, GeeCollection* videos);
-void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCollection* sources, gboolean delete_backing, ProgressMonitor monitor, void* monitor_target, GeeList* not_removed);
-gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 total, gboolean do_event_loop);
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
+void media_source_collection_filter_media (GeeCollection* media,
+                                           GeeCollection* photos,
+                                           GeeCollection* videos);
+void media_source_collection_remove_from_app (MediaSourceCollection* self,
+                                              GeeCollection* sources,
+                                              gboolean delete_backing,
+                                              ProgressMonitor monitor,
+                                              void* monitor_target,
+                                              GeeList* not_removed);
+gboolean progress_dialog_monitor (ProgressDialog* self,
+                                  guint64 count,
+                                  guint64 total,
+                                  gboolean do_event_loop);
+static gboolean _progress_dialog_monitor_progress_monitor (guint64 current,
+                                                    guint64 total,
+                                                    gboolean do_event_loop,
+                                                    gpointer self);
 void progress_dialog_close (ProgressDialog* self);
 void page_window_set_normal_cursor (PageWindow* self);
 static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base);
 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 dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
-enum  {
-	OFFLINE_PAGE_OFFLINE_VIEW_DUMMY_PROPERTY
-};
 gint thumbnail_get_DEFAULT_SCALE (void);
-Thumbnail* thumbnail_new (MediaSource* media, gint scale);
-Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale);
+Thumbnail* thumbnail_new (MediaSource* media,
+                          gint scale);
+Thumbnail* thumbnail_construct (GType object_type,
+                                MediaSource* media,
+                                gint scale);
 gboolean media_source_is_offline (MediaSource* self);
-enum  {
-	OFFLINE_PAGE_OFFLINE_SEARCH_VIEW_FILTER_DUMMY_PROPERTY
-};
 static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base);
 GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
@@ -861,21 +943,32 @@ static void offline_page_finalize (GObject * obj);
 
 static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offline_page_on_remove_from_library_gsimple_action_activate_callback}};
 
-static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
+static void
+_offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender,
+                                                                                            GeeCollection* added,
+                                                                                            GeeCollection* removed,
+                                                                                            gpointer self)
+{
 #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_on_offline_contents_altered ((OfflinePage*) self, added, removed);
-#line 868 "OfflinePage.c"
+#line 955 "OfflinePage.c"
 }
 
 
-static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_on_remove_from_library ((OfflinePage*) self);
-#line 875 "OfflinePage.c"
+#line 966 "OfflinePage.c"
 }
 
 
-OfflinePage* offline_page_construct (GType object_type) {
+OfflinePage*
+offline_page_construct (GType object_type)
+{
 	OfflinePage * self = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -936,69 +1029,65 @@ OfflinePage* offline_page_construct (GType object_type) {
 	_g_object_unref0 (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 940 "OfflinePage.c"
+#line 1033 "OfflinePage.c"
 }
 
 
-OfflinePage* offline_page_new (void) {
+OfflinePage*
+offline_page_new (void)
+{
 #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_construct (TYPE_OFFLINE_PAGE);
-#line 947 "OfflinePage.c"
+#line 1042 "OfflinePage.c"
 }
 
 
-static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+offline_page_real_init_collect_ui_filenames (Page* base,
+                                             GeeList* ui_filenames)
+{
 	OfflinePage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 49 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 50 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = ui_filenames;
-#line 50 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = ui_filenames;
+	PAGE_CLASS (offline_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), ui_filenames);
 #line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui");
-#line 967 "OfflinePage.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui");
+#line 1059 "OfflinePage.c"
 }
 
 
-static void offline_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+offline_page_real_add_actions (Page* base,
+                               GActionMap* map)
+{
 	OfflinePage * self;
-	GActionMap* _tmp0_;
-	GActionMap* _tmp1_;
 #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = map;
-#line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = map;
+	PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	g_action_map_add_action_entries (_tmp1_, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self);
-#line 987 "OfflinePage.c"
+	g_action_map_add_action_entries (map, OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self);
+#line 1076 "OfflinePage.c"
 }
 
 
-static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+offline_page_real_remove_actions (Page* base,
+                                  GActionMap* map)
+{
 	OfflinePage * self;
-	GActionMap* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = map;
-#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_);
-#line 1002 "OfflinePage.c"
+	PAGE_CLASS (offline_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), map);
+#line 1091 "OfflinePage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1010,38 +1099,39 @@ static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
 		entry_collection_length1 = G_N_ELEMENTS (OFFLINE_PAGE_entries);
 #line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (OFFLINE_PAGE_entries); entry_it = entry_it + 1) {
-#line 1014 "OfflinePage.c"
+#line 1103 "OfflinePage.c"
 			GActionEntry entry = {0};
 #line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			entry = entry_collection[entry_it];
-#line 1018 "OfflinePage.c"
+#line 1107 "OfflinePage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
-#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp1_ = map;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp2_ = entry;
+				_tmp0_ = entry;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp3_ = _tmp2_.name;
+				_tmp1_ = _tmp0_.name;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1031 "OfflinePage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 1117 "OfflinePage.c"
 			}
 		}
 	}
 }
 
 
-static gpointer _core_tracker_ref0 (gpointer self) {
+static gpointer
+_core_tracker_ref0 (gpointer self)
+{
 #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 1041 "OfflinePage.c"
+#line 1129 "OfflinePage.c"
 }
 
 
-static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base) {
+static CoreViewTracker*
+offline_page_real_get_view_tracker (CheckerboardPage* base)
+{
 	OfflinePage * self;
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_;
@@ -1056,34 +1146,31 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba
 	result = _tmp1_;
 #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1060 "OfflinePage.c"
+#line 1150 "OfflinePage.c"
 }
 
 
-static void offline_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+offline_page_real_update_actions (Page* base,
+                                  gint selected_count,
+                                  gint count)
+{
 	OfflinePage * self;
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 #line 76 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = selected_count;
-#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp0_ > 0);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", selected_count > 0);
 #line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = selected_count;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_ = count;
-#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 1081 "OfflinePage.c"
+	PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), selected_count, count);
+#line 1166 "OfflinePage.c"
 }
 
 
-static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_;
-	GeeCollection* _tmp12_;
+static void
+offline_page_on_offline_contents_altered (OfflinePage* self,
+                                          GeeCollection* added,
+                                          GeeCollection* removed)
+{
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1091,193 +1178,184 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = added;
-#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp0_ != NULL) {
-#line 1098 "OfflinePage.c"
+	if (added != NULL) {
+#line 1183 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_;
-			GeeIterator* _tmp2_;
+			GeeIterator* _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp1_ = added;
+			_tmp0_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (added, GEE_TYPE_ITERABLE, GeeIterable));
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_source_it = _tmp2_;
+			_source_it = _tmp0_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1111 "OfflinePage.c"
-				GeeIterator* _tmp3_;
-				gboolean _tmp4_;
+#line 1193 "OfflinePage.c"
+				GeeIterator* _tmp1_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp5_;
-				gpointer _tmp6_;
-				ViewCollection* _tmp7_;
-				ViewCollection* _tmp8_;
-				MediaSource* _tmp9_;
-				OfflinePageOfflineView* _tmp10_;
-				OfflinePageOfflineView* _tmp11_;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp3_ = _source_it;
+				GeeIterator* _tmp2_;
+				gpointer _tmp3_;
+				ViewCollection* _tmp4_;
+				ViewCollection* _tmp5_;
+				MediaSource* _tmp6_;
+				OfflinePageOfflineView* _tmp7_;
+				OfflinePageOfflineView* _tmp8_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp4_ = gee_iterator_next (_tmp3_);
+				_tmp1_ = _source_it;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				if (!_tmp4_) {
+				if (!gee_iterator_next (_tmp1_)) {
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1130 "OfflinePage.c"
+#line 1209 "OfflinePage.c"
 				}
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp5_ = _source_it;
+				_tmp2_ = _source_it;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp6_ = gee_iterator_get (_tmp5_);
+				_tmp3_ = gee_iterator_get (_tmp2_);
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				source = (MediaSource*) _tmp6_;
+				source = (MediaSource*) _tmp3_;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp8_ = _tmp7_;
+				_tmp5_ = _tmp4_;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp9_ = source;
+				_tmp6_ = source;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp10_ = offline_page_offline_view_new (_tmp9_);
+				_tmp7_ = offline_page_offline_view_new (_tmp6_);
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp11_ = _tmp10_;
+				_tmp8_ = _tmp7_;
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
+				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_g_object_unref0 (_tmp11_);
+				_g_object_unref0 (_tmp8_);
 #line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_data_collection_unref0 (_tmp8_);
+				_data_collection_unref0 (_tmp5_);
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1156 "OfflinePage.c"
+#line 1235 "OfflinePage.c"
 			}
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1160 "OfflinePage.c"
+#line 1239 "OfflinePage.c"
 		}
 	}
 #line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp12_ = removed;
-#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp12_ != NULL) {
-#line 1167 "OfflinePage.c"
+	if (removed != NULL) {
+#line 1244 "OfflinePage.c"
 		Marker* marker = NULL;
-		ViewCollection* _tmp13_;
-		ViewCollection* _tmp14_;
-		Marker* _tmp15_;
-		Marker* _tmp16_;
-		ViewCollection* _tmp29_;
-		ViewCollection* _tmp30_;
-		Marker* _tmp31_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
+		Marker* _tmp11_;
+		Marker* _tmp12_;
+		ViewCollection* _tmp23_;
+		ViewCollection* _tmp24_;
+		Marker* _tmp25_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp10_ = _tmp9_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
+		_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp12_ = _tmp11_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_data_collection_unref0 (_tmp14_);
+		_data_collection_unref0 (_tmp10_);
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		marker = _tmp16_;
-#line 1188 "OfflinePage.c"
+		marker = _tmp12_;
+#line 1265 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp17_;
-			GeeIterator* _tmp18_;
+			GeeIterator* _tmp13_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp17_ = removed;
+			_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (removed, GEE_TYPE_ITERABLE, GeeIterable));
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-			_source_it = _tmp18_;
+			_source_it = _tmp13_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1201 "OfflinePage.c"
-				GeeIterator* _tmp19_;
-				gboolean _tmp20_;
+#line 1275 "OfflinePage.c"
+				GeeIterator* _tmp14_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp21_;
-				gpointer _tmp22_;
-				Marker* _tmp23_;
-				ViewCollection* _tmp24_;
-				ViewCollection* _tmp25_;
-				MediaSource* _tmp26_;
-				DataView* _tmp27_;
-				DataView* _tmp28_;
-#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp19_ = _source_it;
+				GeeIterator* _tmp15_;
+				gpointer _tmp16_;
+				Marker* _tmp17_;
+				ViewCollection* _tmp18_;
+				ViewCollection* _tmp19_;
+				MediaSource* _tmp20_;
+				DataView* _tmp21_;
+				DataView* _tmp22_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp20_ = gee_iterator_next (_tmp19_);
+				_tmp14_ = _source_it;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				if (!_tmp20_) {
+				if (!gee_iterator_next (_tmp14_)) {
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1221 "OfflinePage.c"
+#line 1292 "OfflinePage.c"
 				}
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp21_ = _source_it;
+				_tmp15_ = _source_it;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp22_ = gee_iterator_get (_tmp21_);
+				_tmp16_ = gee_iterator_get (_tmp15_);
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				source = (MediaSource*) _tmp22_;
+				source = (MediaSource*) _tmp16_;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp23_ = marker;
+				_tmp17_ = marker;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp25_ = _tmp24_;
+				_tmp19_ = _tmp18_;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp26_ = source;
+				_tmp20_ = source;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
+				_tmp21_ = view_collection_get_view_for_source (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_SOURCE, DataSource));
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_tmp28_ = _tmp27_;
+				_tmp22_ = _tmp21_;
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
+				marker_mark (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_g_object_unref0 (_tmp28_);
+				_g_object_unref0 (_tmp22_);
 #line 92 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-				_data_collection_unref0 (_tmp25_);
+				_data_collection_unref0 (_tmp19_);
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1249 "OfflinePage.c"
+#line 1320 "OfflinePage.c"
 			}
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1253 "OfflinePage.c"
+#line 1324 "OfflinePage.c"
 		}
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp30_ = _tmp29_;
+		_tmp24_ = _tmp23_;
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp31_ = marker;
+		_tmp25_ = marker;
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
+		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), _tmp25_);
 #line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_data_collection_unref0 (_tmp30_);
+		_data_collection_unref0 (_tmp24_);
 #line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (marker);
-#line 1267 "OfflinePage.c"
+#line 1338 "OfflinePage.c"
 	}
 }
 
 
-static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
+static gboolean
+_progress_dialog_monitor_progress_monitor (guint64 current,
+                                           guint64 total,
+                                           gboolean do_event_loop,
+                                           gpointer self)
+{
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1277 "OfflinePage.c"
+#line 1353 "OfflinePage.c"
 }
 
 
-static void offline_page_on_remove_from_library (OfflinePage* self) {
+static void
+offline_page_on_remove_from_library (OfflinePage* self)
+{
 	GeeCollection* sources = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -1292,24 +1370,23 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 	gint _tmp10_;
 	gint _tmp11_;
 	gboolean _tmp12_;
-	gboolean _tmp13_;
+	AppWindow* _tmp13_;
 	AppWindow* _tmp14_;
-	AppWindow* _tmp15_;
 	ProgressDialog* progress = NULL;
-	GeeCollection* _tmp16_;
+	GeeCollection* _tmp15_;
+	gint _tmp16_;
 	gint _tmp17_;
-	gint _tmp18_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp22_;
+	GeeArrayList* _tmp21_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp23_;
-	GeeCollection* _tmp24_;
+	GeeArrayList* _tmp22_;
+	GeeCollection* _tmp23_;
+	GeeArrayList* _tmp24_;
 	GeeArrayList* _tmp25_;
-	GeeArrayList* _tmp26_;
-	ProgressDialog* _tmp27_;
-	ProgressDialog* _tmp38_;
+	ProgressDialog* _tmp26_;
+	ProgressDialog* _tmp37_;
+	AppWindow* _tmp39_;
 	AppWindow* _tmp40_;
-	AppWindow* _tmp41_;
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
 #line 98 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1336,7 +1413,7 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 		_g_object_unref0 (sources);
 #line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1340 "OfflinePage.c"
+#line 1417 "OfflinePage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp7_ = app_window_get_instance ();
@@ -1349,140 +1426,138 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp11_ = _tmp10_;
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp12_ = remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_);
-#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp13_ = !_tmp12_;
+	_tmp12_ = !remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_);
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp8_);
 #line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp13_) {
+	if (_tmp12_) {
 #line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (sources);
 #line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1364 "OfflinePage.c"
+#line 1439 "OfflinePage.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp14_ = app_window_get_instance ();
+	_tmp13_ = app_window_get_instance ();
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_g_object_unref0 (_tmp15_);
+	_g_object_unref0 (_tmp14_);
 #line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	progress = NULL;
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp16_ = sources;
+	_tmp15_ = sources;
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp17_ = gee_collection_get_size (_tmp16_);
+	_tmp16_ = gee_collection_get_size (_tmp15_);
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp18_ = _tmp17_;
+	_tmp17_ = _tmp16_;
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp18_ >= 20) {
-#line 1384 "OfflinePage.c"
+	if (_tmp17_ >= 20) {
+#line 1459 "OfflinePage.c"
+		AppWindow* _tmp18_;
 		AppWindow* _tmp19_;
-		AppWindow* _tmp20_;
-		ProgressDialog* _tmp21_;
+		ProgressDialog* _tmp20_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp19_ = app_window_get_instance ();
+		_tmp18_ = app_window_get_instance ();
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp21_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL);
+		_tmp20_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		g_object_ref_sink (_tmp21_);
+		g_object_ref_sink (_tmp20_);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (progress);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		progress = _tmp21_;
+		progress = _tmp20_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_g_object_unref0 (_tmp20_);
-#line 1402 "OfflinePage.c"
+		_g_object_unref0 (_tmp19_);
+#line 1477 "OfflinePage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp22_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp21_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	photos = _tmp22_;
+	photos = _tmp21_;
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp23_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp22_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	videos = _tmp23_;
+	videos = _tmp22_;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp24_ = sources;
+	_tmp23_ = sources;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp25_ = photos;
+	_tmp24_ = photos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp26_ = videos;
+	_tmp25_ = videos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	media_source_collection_filter_media (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+	media_source_collection_filter_media (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp27_ = progress;
+	_tmp26_ = progress;
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp27_ != NULL) {
-#line 1424 "OfflinePage.c"
-		LibraryPhotoSourceCollection* _tmp28_;
-		GeeArrayList* _tmp29_;
-		ProgressDialog* _tmp30_;
-		VideoSourceCollection* _tmp31_;
-		GeeArrayList* _tmp32_;
-		ProgressDialog* _tmp33_;
+	if (_tmp26_ != NULL) {
+#line 1499 "OfflinePage.c"
+		LibraryPhotoSourceCollection* _tmp27_;
+		GeeArrayList* _tmp28_;
+		ProgressDialog* _tmp29_;
+		VideoSourceCollection* _tmp30_;
+		GeeArrayList* _tmp31_;
+		ProgressDialog* _tmp32_;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp28_ = library_photo_global;
+		_tmp27_ = library_photo_global;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp29_ = photos;
+		_tmp28_ = photos;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp30_ = progress;
+		_tmp29_ = progress;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp30_, NULL);
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp29_, NULL);
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp31_ = video_global;
+		_tmp30_ = video_global;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp32_ = videos;
+		_tmp31_ = videos;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp33_ = progress;
+		_tmp32_ = progress;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp33_, NULL);
-#line 1447 "OfflinePage.c"
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp32_, NULL);
+#line 1522 "OfflinePage.c"
 	} else {
-		LibraryPhotoSourceCollection* _tmp34_;
-		GeeArrayList* _tmp35_;
-		VideoSourceCollection* _tmp36_;
-		GeeArrayList* _tmp37_;
+		LibraryPhotoSourceCollection* _tmp33_;
+		GeeArrayList* _tmp34_;
+		VideoSourceCollection* _tmp35_;
+		GeeArrayList* _tmp36_;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp34_ = library_photo_global;
+		_tmp33_ = library_photo_global;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp35_ = photos;
+		_tmp34_ = photos;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp36_ = video_global;
+		_tmp35_ = video_global;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp37_ = videos;
+		_tmp36_ = videos;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
-#line 1465 "OfflinePage.c"
+		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
+#line 1540 "OfflinePage.c"
 	}
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp38_ = progress;
+	_tmp37_ = progress;
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp38_ != NULL) {
-#line 1471 "OfflinePage.c"
-		ProgressDialog* _tmp39_;
+	if (_tmp37_ != NULL) {
+#line 1546 "OfflinePage.c"
+		ProgressDialog* _tmp38_;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp39_ = progress;
+		_tmp38_ = progress;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		progress_dialog_close (_tmp39_);
-#line 1477 "OfflinePage.c"
+		progress_dialog_close (_tmp38_);
+#line 1552 "OfflinePage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp40_ = app_window_get_instance ();
+	_tmp39_ = app_window_get_instance ();
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp41_ = _tmp40_;
+	_tmp40_ = _tmp39_;
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE_WINDOW, PageWindow));
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_g_object_unref0 (_tmp41_);
+	_g_object_unref0 (_tmp40_);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (videos);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1491,18 +1566,22 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 	_g_object_unref0 (progress);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (sources);
-#line 1495 "OfflinePage.c"
+#line 1570 "OfflinePage.c"
 }
 
 
-static gpointer _view_filter_ref0 (gpointer self) {
+static gpointer
+_view_filter_ref0 (gpointer self)
+{
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1502 "OfflinePage.c"
+#line 1579 "OfflinePage.c"
 }
 
 
-static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base) {
+static SearchViewFilter*
+offline_page_real_get_search_view_filter (CheckerboardPage* base)
+{
 	OfflinePage * self;
 	SearchViewFilter* result = NULL;
 	OfflinePageOfflineSearchViewFilter* _tmp0_;
@@ -1517,58 +1596,60 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP
 	result = _tmp1_;
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1521 "OfflinePage.c"
+#line 1600 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source) {
+static OfflinePageOfflineView*
+offline_page_offline_view_construct (GType object_type,
+                                     MediaSource* source)
+{
 	OfflinePageOfflineView * self = NULL;
-	MediaSource* _tmp0_;
+	gint _tmp0_;
 	gint _tmp1_;
-	gint _tmp2_;
-	MediaSource* _tmp3_;
-	gboolean _tmp4_;
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
 #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp0_ = source;
-#line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = thumbnail_get_DEFAULT_SCALE ();
+	_tmp0_ = thumbnail_get_DEFAULT_SCALE ();
 #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	self = (OfflinePageOfflineView*) thumbnail_construct (object_type, _tmp0_, _tmp2_);
-#line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp3_ = source;
-#line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp4_ = media_source_is_offline (_tmp3_);
+	self = (OfflinePageOfflineView*) thumbnail_construct (object_type, source, _tmp1_);
 #line 14 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_vala_assert (_tmp4_, "source.is_offline()");
+	_vala_assert (media_source_is_offline (source), "source.is_offline()");
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1550 "OfflinePage.c"
+#line 1623 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source) {
+static OfflinePageOfflineView*
+offline_page_offline_view_new (MediaSource* source)
+{
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_view_construct (OFFLINE_PAGE_TYPE_OFFLINE_VIEW, source);
-#line 1557 "OfflinePage.c"
+#line 1632 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) {
+static void
+offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass)
+{
 #line 10 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_view_parent_class = g_type_class_peek_parent (klass);
-#line 1564 "OfflinePage.c"
+#line 1641 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_view_instance_init (OfflinePageOfflineView * self) {
+static void
+offline_page_offline_view_instance_init (OfflinePageOfflineView * self)
+{
 }
 
 
-static GType offline_page_offline_view_get_type (void) {
+static GType
+offline_page_offline_view_get_type (void)
+{
 	static volatile gsize offline_page_offline_view_type_id__volatile = 0;
 	if (g_once_init_enter (&offline_page_offline_view_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (OfflinePageOfflineViewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_offline_view_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePageOfflineView), 0, (GInstanceInitFunc) offline_page_offline_view_instance_init, NULL };
@@ -1580,7 +1661,9 @@ static GType offline_page_offline_view_get_type (void) {
 }
 
 
-static guint offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base) {
+static guint
+offline_page_offline_search_view_filter_real_get_criteria (SearchViewFilter* base)
+{
 	OfflinePageOfflineSearchViewFilter * self;
 	guint result = 0U;
 #line 19 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1589,41 +1672,51 @@ static guint offline_page_offline_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1593 "OfflinePage.c"
+#line 1676 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type) {
+static OfflinePageOfflineSearchViewFilter*
+offline_page_offline_search_view_filter_construct (GType object_type)
+{
 	OfflinePageOfflineSearchViewFilter* self = NULL;
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1603 "OfflinePage.c"
+#line 1688 "OfflinePage.c"
 }
 
 
-static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void) {
+static OfflinePageOfflineSearchViewFilter*
+offline_page_offline_search_view_filter_new (void)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_search_view_filter_construct (OFFLINE_PAGE_TYPE_OFFLINE_SEARCH_VIEW_FILTER);
-#line 1610 "OfflinePage.c"
+#line 1697 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_search_view_filter_class_init (OfflinePageOfflineSearchViewFilterClass * klass) {
+static void
+offline_page_offline_search_view_filter_class_init (OfflinePageOfflineSearchViewFilterClass * klass)
+{
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) offline_page_offline_search_view_filter_real_get_criteria;
-#line 1619 "OfflinePage.c"
+#line 1708 "OfflinePage.c"
 }
 
 
-static void offline_page_offline_search_view_filter_instance_init (OfflinePageOfflineSearchViewFilter * self) {
+static void
+offline_page_offline_search_view_filter_instance_init (OfflinePageOfflineSearchViewFilter * self)
+{
 }
 
 
-static GType offline_page_offline_search_view_filter_get_type (void) {
+static GType
+offline_page_offline_search_view_filter_get_type (void)
+{
 	static volatile gsize offline_page_offline_search_view_filter_type_id__volatile = 0;
 	if (g_once_init_enter (&offline_page_offline_search_view_filter_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (OfflinePageOfflineSearchViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_offline_search_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePageOfflineSearchViewFilter), 0, (GInstanceInitFunc) offline_page_offline_search_view_filter_instance_init, NULL };
@@ -1635,7 +1728,9 @@ static GType offline_page_offline_search_view_filter_get_type (void) {
 }
 
 
-static void offline_page_class_init (OfflinePageClass * klass) {
+static void
+offline_page_class_init (OfflinePageClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1654,11 +1749,13 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*) (CheckerboardPage *)) offline_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = offline_page_finalize;
-#line 1658 "OfflinePage.c"
+#line 1753 "OfflinePage.c"
 }
 
 
-static void offline_page_instance_init (OfflinePage * self) {
+static void
+offline_page_instance_init (OfflinePage * self)
+{
 	OfflinePageOfflineSearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv = OFFLINE_PAGE_GET_PRIVATE (self);
@@ -1666,11 +1763,13 @@ static void offline_page_instance_init (OfflinePage * self) {
 	_tmp0_ = offline_page_offline_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1670 "OfflinePage.c"
+#line 1767 "OfflinePage.c"
 }
 
 
-static void offline_page_finalize (GObject * obj) {
+static void
+offline_page_finalize (GObject * obj)
+{
 	OfflinePage * self;
 	LibraryPhotoSourceCollection* _tmp0_;
 	guint _tmp1_;
@@ -1696,11 +1795,13 @@ static void offline_page_finalize (GObject * obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (offline_page_parent_class)->finalize (obj);
-#line 1700 "OfflinePage.c"
+#line 1799 "OfflinePage.c"
 }
 
 
-GType offline_page_get_type (void) {
+GType
+offline_page_get_type (void)
+{
 	static volatile gsize offline_page_type_id__volatile = 0;
 	if (g_once_init_enter (&offline_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (OfflinePageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) offline_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (OfflinePage), 0, (GInstanceInitFunc) offline_page_instance_init, NULL };