Update upstream source from tag 'upstream/0.26.4'

Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4

1 files changed, 174 insertions, 177 deletions

diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index f789adf..b3a06a0 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1,4 +1,4 @@
-/* OfflinePage.c generated by valac 0.34.7, the Vala compiler
+/* OfflinePage.c generated by valac 0.36.6, the Vala compiler
  * generated from OfflinePage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -857,7 +857,7 @@ enum  {
 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);
-static void offline_page_finalize (GObject* obj);
+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}};
 
@@ -877,17 +877,17 @@ static void _offline_page_on_remove_from_library_gsimple_action_activate_callbac
 
 OfflinePage* offline_page_construct (GType object_type) {
 	OfflinePage * self = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	MediaViewTracker* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	VideoSourceCollection* _tmp4_ = NULL;
-	LibraryPhotoSourceCollection* _tmp5_ = NULL;
-	GeeCollection* _tmp6_ = NULL;
-	GeeCollection* _tmp7_ = NULL;
-	VideoSourceCollection* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	GeeCollection* _tmp10_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	MediaViewTracker* _tmp2_;
+	LibraryPhotoSourceCollection* _tmp3_;
+	VideoSourceCollection* _tmp4_;
+	LibraryPhotoSourceCollection* _tmp5_;
+	GeeCollection* _tmp6_;
+	GeeCollection* _tmp7_;
+	VideoSourceCollection* _tmp8_;
+	GeeCollection* _tmp9_;
+	GeeCollection* _tmp10_;
 #line 29 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = (OfflinePage*) checkerboard_page_construct (object_type, OFFLINE_PAGE_NAME);
 #line 31 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -949,8 +949,8 @@ OfflinePage* offline_page_new (void) {
 
 static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	OfflinePage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
+	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"
@@ -969,8 +969,8 @@ static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui
 
 static void offline_page_real_add_actions (Page* base, GActionMap* map) {
 	OfflinePage * self;
-	GActionMap* _tmp0_ = NULL;
-	GActionMap* _tmp1_ = NULL;
+	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"
@@ -989,7 +989,7 @@ static void offline_page_real_add_actions (Page* base, GActionMap* map) {
 
 static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
 	OfflinePage * self;
-	GActionMap* _tmp0_ = NULL;
+	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"
@@ -1016,9 +1016,9 @@ static void offline_page_real_remove_actions (Page* base, GActionMap* map) {
 			entry = entry_collection[entry_it];
 #line 1018 "OfflinePage.c"
 			{
-				GActionMap* _tmp1_ = NULL;
-				GActionEntry _tmp2_ = {0};
-				const gchar* _tmp3_ = NULL;
+				GActionMap* _tmp1_;
+				GActionEntry _tmp2_;
+				const gchar* _tmp3_;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp1_ = map;
 #line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1044,8 +1044,8 @@ static gpointer _core_tracker_ref0 (gpointer self) {
 static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base) {
 	OfflinePage * self;
 	CoreViewTracker* result = NULL;
-	MediaViewTracker* _tmp0_ = NULL;
-	CoreViewTracker* _tmp1_ = NULL;
+	MediaViewTracker* _tmp0_;
+	CoreViewTracker* _tmp1_;
 #line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1062,9 +1062,9 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba
 
 static void offline_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	OfflinePage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	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"
@@ -1082,8 +1082,8 @@ static void offline_page_real_update_actions (Page* base, gint selected_count, g
 
 
 static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) {
-	GeeCollection* _tmp0_ = NULL;
-	GeeCollection* _tmp12_ = NULL;
+	GeeCollection* _tmp0_;
+	GeeCollection* _tmp12_;
 #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"
@@ -1097,8 +1097,8 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 1098 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp1_ = NULL;
-			GeeIterator* _tmp2_ = NULL;
+			GeeCollection* _tmp1_;
+			GeeIterator* _tmp2_;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp1_ = added;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1108,16 +1108,16 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
 #line 1111 "OfflinePage.c"
-				GeeIterator* _tmp3_ = NULL;
-				gboolean _tmp4_ = FALSE;
+				GeeIterator* _tmp3_;
+				gboolean _tmp4_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp5_ = NULL;
-				gpointer _tmp6_ = NULL;
-				ViewCollection* _tmp7_ = NULL;
-				ViewCollection* _tmp8_ = NULL;
-				MediaSource* _tmp9_ = NULL;
-				OfflinePageOfflineView* _tmp10_ = NULL;
-				OfflinePageOfflineView* _tmp11_ = 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;
 #line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1165,13 +1165,13 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 	if (_tmp12_ != NULL) {
 #line 1167 "OfflinePage.c"
 		Marker* marker = NULL;
-		ViewCollection* _tmp13_ = NULL;
-		ViewCollection* _tmp14_ = NULL;
-		Marker* _tmp15_ = NULL;
-		Marker* _tmp16_ = NULL;
-		ViewCollection* _tmp29_ = NULL;
-		ViewCollection* _tmp30_ = NULL;
-		Marker* _tmp31_ = NULL;
+		ViewCollection* _tmp13_;
+		ViewCollection* _tmp14_;
+		Marker* _tmp15_;
+		Marker* _tmp16_;
+		ViewCollection* _tmp29_;
+		ViewCollection* _tmp30_;
+		Marker* _tmp31_;
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1187,8 +1187,8 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 1188 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
-			GeeCollection* _tmp17_ = NULL;
-			GeeIterator* _tmp18_ = NULL;
+			GeeCollection* _tmp17_;
+			GeeIterator* _tmp18_;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp17_ = removed;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1198,17 +1198,17 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
 #line 1201 "OfflinePage.c"
-				GeeIterator* _tmp19_ = NULL;
-				gboolean _tmp20_ = FALSE;
+				GeeIterator* _tmp19_;
+				gboolean _tmp20_;
 				MediaSource* source = NULL;
-				GeeIterator* _tmp21_ = NULL;
-				gpointer _tmp22_ = NULL;
-				Marker* _tmp23_ = NULL;
-				ViewCollection* _tmp24_ = NULL;
-				ViewCollection* _tmp25_ = NULL;
-				MediaSource* _tmp26_ = NULL;
-				DataView* _tmp27_ = NULL;
-				DataView* _tmp28_ = 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;
 #line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1279,37 +1279,37 @@ static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guin
 
 static void offline_page_on_remove_from_library (OfflinePage* self) {
 	GeeCollection* sources = NULL;
-	ViewCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-	GeeCollection* _tmp3_ = NULL;
-	GeeCollection* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	AppWindow* _tmp7_ = NULL;
-	AppWindow* _tmp8_ = NULL;
-	GeeCollection* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	AppWindow* _tmp14_ = NULL;
-	AppWindow* _tmp15_ = NULL;
+	ViewCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	GeeList* _tmp2_;
+	GeeCollection* _tmp3_;
+	GeeCollection* _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	AppWindow* _tmp7_;
+	AppWindow* _tmp8_;
+	GeeCollection* _tmp9_;
+	gint _tmp10_;
+	gint _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	AppWindow* _tmp14_;
+	AppWindow* _tmp15_;
 	ProgressDialog* progress = NULL;
-	GeeCollection* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
+	GeeCollection* _tmp16_;
+	gint _tmp17_;
+	gint _tmp18_;
 	GeeArrayList* photos = NULL;
-	GeeArrayList* _tmp23_ = NULL;
+	GeeArrayList* _tmp22_;
 	GeeArrayList* videos = NULL;
-	GeeArrayList* _tmp24_ = NULL;
-	GeeCollection* _tmp25_ = NULL;
-	GeeArrayList* _tmp26_ = NULL;
-	GeeArrayList* _tmp27_ = NULL;
-	ProgressDialog* _tmp28_ = NULL;
-	ProgressDialog* _tmp39_ = NULL;
-	AppWindow* _tmp41_ = NULL;
-	AppWindow* _tmp42_ = NULL;
+	GeeArrayList* _tmp23_;
+	GeeCollection* _tmp24_;
+	GeeArrayList* _tmp25_;
+	GeeArrayList* _tmp26_;
+	ProgressDialog* _tmp27_;
+	ProgressDialog* _tmp38_;
+	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"
@@ -1381,111 +1381,108 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 #line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp18_ >= 20) {
 #line 1384 "OfflinePage.c"
-		AppWindow* _tmp19_ = NULL;
-		AppWindow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		ProgressDialog* _tmp22_ = NULL;
+		AppWindow* _tmp19_;
+		AppWindow* _tmp20_;
+		ProgressDialog* _tmp21_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp19_ = app_window_get_instance ();
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp20_ = _tmp19_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp21_ = _ ("Deleting…");
+		_tmp21_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _ ("Deleting…"), NULL);
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp22_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _tmp21_, NULL);
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		g_object_ref_sink (_tmp22_);
+		g_object_ref_sink (_tmp21_);
 #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 = _tmp22_;
+		progress = _tmp21_;
 #line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1405 "OfflinePage.c"
+#line 1402 "OfflinePage.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp22_ = 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 = _tmp23_;
+	photos = _tmp22_;
 #line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp23_ = 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 = _tmp24_;
+	videos = _tmp23_;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp25_ = sources;
+	_tmp24_ = sources;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp26_ = photos;
+	_tmp25_ = photos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp27_ = videos;
+	_tmp26_ = videos;
 #line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	media_source_collection_filter_media (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+	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));
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp28_ = progress;
+	_tmp27_ = progress;
 #line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp28_ != NULL) {
-#line 1427 "OfflinePage.c"
-		LibraryPhotoSourceCollection* _tmp29_ = NULL;
-		GeeArrayList* _tmp30_ = NULL;
-		ProgressDialog* _tmp31_ = NULL;
-		VideoSourceCollection* _tmp32_ = NULL;
-		GeeArrayList* _tmp33_ = NULL;
-		ProgressDialog* _tmp34_ = NULL;
+	if (_tmp27_ != NULL) {
+#line 1424 "OfflinePage.c"
+		LibraryPhotoSourceCollection* _tmp28_;
+		GeeArrayList* _tmp29_;
+		ProgressDialog* _tmp30_;
+		VideoSourceCollection* _tmp31_;
+		GeeArrayList* _tmp32_;
+		ProgressDialog* _tmp33_;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp29_ = library_photo_global;
+		_tmp28_ = library_photo_global;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp30_ = photos;
+		_tmp29_ = photos;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp31_ = progress;
+		_tmp30_ = progress;
 #line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp31_, NULL);
+		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);
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp32_ = video_global;
+		_tmp31_ = video_global;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp33_ = videos;
+		_tmp32_ = videos;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp34_ = progress;
+		_tmp33_ = progress;
 #line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp34_, NULL);
-#line 1450 "OfflinePage.c"
+		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"
 	} else {
-		LibraryPhotoSourceCollection* _tmp35_ = NULL;
-		GeeArrayList* _tmp36_ = NULL;
-		VideoSourceCollection* _tmp37_ = NULL;
-		GeeArrayList* _tmp38_ = NULL;
+		LibraryPhotoSourceCollection* _tmp34_;
+		GeeArrayList* _tmp35_;
+		VideoSourceCollection* _tmp36_;
+		GeeArrayList* _tmp37_;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp35_ = library_photo_global;
+		_tmp34_ = library_photo_global;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp36_ = photos;
+		_tmp35_ = photos;
 #line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		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);
+		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);
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp37_ = video_global;
+		_tmp36_ = video_global;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp38_ = videos;
+		_tmp37_ = videos;
 #line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
-#line 1468 "OfflinePage.c"
+		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"
 	}
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp39_ = progress;
+	_tmp38_ = progress;
 #line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (_tmp39_ != NULL) {
-#line 1474 "OfflinePage.c"
-		ProgressDialog* _tmp40_ = NULL;
+	if (_tmp38_ != NULL) {
+#line 1471 "OfflinePage.c"
+		ProgressDialog* _tmp39_;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp40_ = progress;
+		_tmp39_ = progress;
 #line 125 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		progress_dialog_close (_tmp40_);
-#line 1480 "OfflinePage.c"
+		progress_dialog_close (_tmp39_);
+#line 1477 "OfflinePage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp41_ = app_window_get_instance ();
+	_tmp40_ = app_window_get_instance ();
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp42_ = _tmp41_;
+	_tmp41_ = _tmp40_;
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE_WINDOW, PageWindow));
+	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PAGE_WINDOW, PageWindow));
 #line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_g_object_unref0 (_tmp42_);
+	_g_object_unref0 (_tmp41_);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (videos);
 #line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1494,22 +1491,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 1498 "OfflinePage.c"
+#line 1495 "OfflinePage.c"
 }
 
 
 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 1505 "OfflinePage.c"
+#line 1502 "OfflinePage.c"
 }
 
 
 static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardPage* base) {
 	OfflinePage * self;
 	SearchViewFilter* result = NULL;
-	OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL;
-	SearchViewFilter* _tmp1_ = NULL;
+	OfflinePageOfflineSearchViewFilter* _tmp0_;
+	SearchViewFilter* _tmp1_;
 #line 130 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 131 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1520,17 +1517,17 @@ 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 1524 "OfflinePage.c"
+#line 1521 "OfflinePage.c"
 }
 
 
 static OfflinePageOfflineView* offline_page_offline_view_construct (GType object_type, MediaSource* source) {
 	OfflinePageOfflineView * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	MediaSource* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	MediaSource* _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"
@@ -1549,21 +1546,21 @@ static OfflinePageOfflineView* offline_page_offline_view_construct (GType object
 	_vala_assert (_tmp4_, "source.is_offline()");
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1553 "OfflinePage.c"
+#line 1550 "OfflinePage.c"
 }
 
 
 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 1560 "OfflinePage.c"
+#line 1557 "OfflinePage.c"
 }
 
 
 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 1567 "OfflinePage.c"
+#line 1564 "OfflinePage.c"
 }
 
 
@@ -1592,7 +1589,7 @@ 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 1596 "OfflinePage.c"
+#line 1593 "OfflinePage.c"
 }
 
 
@@ -1602,14 +1599,14 @@ static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filt
 	self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1606 "OfflinePage.c"
+#line 1603 "OfflinePage.c"
 }
 
 
 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 1613 "OfflinePage.c"
+#line 1610 "OfflinePage.c"
 }
 
 
@@ -1617,8 +1614,8 @@ static void offline_page_offline_search_view_filter_class_init (OfflinePageOffli
 #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 1622 "OfflinePage.c"
+	((SearchViewFilterClass *) klass)->get_criteria = (guint (*) (SearchViewFilter *)) offline_page_offline_search_view_filter_real_get_criteria;
+#line 1619 "OfflinePage.c"
 }
 
 
@@ -1644,41 +1641,41 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_type_class_add_private (klass, sizeof (OfflinePagePrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->init_collect_ui_filenames = (void (*)(Page*, GeeList*)) offline_page_real_init_collect_ui_filenames;
+	((PageClass *) klass)->init_collect_ui_filenames = (void (*) (Page *, GeeList*)) offline_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->add_actions = (void (*)(Page*, GActionMap*)) offline_page_real_add_actions;
+	((PageClass *) klass)->add_actions = (void (*) (Page *, GActionMap*)) offline_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->remove_actions = (void (*)(Page*, GActionMap*)) offline_page_real_remove_actions;
+	((PageClass *) klass)->remove_actions = (void (*) (Page *, GActionMap*)) offline_page_real_remove_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*)(CheckerboardPage*)) offline_page_real_get_view_tracker;
+	((CheckerboardPageClass *) klass)->get_view_tracker = (CoreViewTracker* (*) (CheckerboardPage *)) offline_page_real_get_view_tracker;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->update_actions = (void (*)(Page*, gint, gint)) offline_page_real_update_actions;
+	((PageClass *) klass)->update_actions = (void (*) (Page *, gint, gint)) offline_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((CheckerboardPageClass *) klass)->get_search_view_filter = (SearchViewFilter* (*)(CheckerboardPage*)) offline_page_real_get_search_view_filter;
+	((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 1661 "OfflinePage.c"
+#line 1658 "OfflinePage.c"
 }
 
 
 static void offline_page_instance_init (OfflinePage * self) {
-	OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL;
+	OfflinePageOfflineSearchViewFilter* _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv = OFFLINE_PAGE_GET_PRIVATE (self);
 #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = offline_page_offline_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1673 "OfflinePage.c"
+#line 1670 "OfflinePage.c"
 }
 
 
-static void offline_page_finalize (GObject* obj) {
+static void offline_page_finalize (GObject * obj) {
 	OfflinePage * self;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	VideoSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
+	LibraryPhotoSourceCollection* _tmp0_;
+	guint _tmp1_;
+	VideoSourceCollection* _tmp2_;
+	guint _tmp3_;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_OFFLINE_PAGE, OfflinePage);
 #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1699,7 +1696,7 @@ 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 1703 "OfflinePage.c"
+#line 1700 "OfflinePage.c"
 }