New upstream version 0.26.4upstream/0.26.4

1 files changed, 293 insertions, 293 deletions

diff --git a/src/Thumbnail.c b/src/Thumbnail.c
index a368b97..c884d23 100644
--- a/src/Thumbnail.c
+++ b/src/Thumbnail.c
@@ -1,4 +1,4 @@
-/* Thumbnail.c generated by valac 0.34.7, the Vala compiler
+/* Thumbnail.c generated by valac 0.36.6, the Vala compiler
  * generated from Thumbnail.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -575,7 +575,7 @@ static void _vala_GValue_free (GValue* self);
 GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale);
 gint thumbnail_cache_size_get_scale (ThumbnailCacheSize self);
 gint thumbnail_get_DEFAULT_SCALE (void);
-static void thumbnail_finalize (GObject* obj);
+static void thumbnail_finalize (GObject * obj);
 static void _vala_thumbnail_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
 
 
@@ -602,28 +602,28 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scale) {
 	Thumbnail * self = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	gint _tmp3_;
 	Dimensions _tmp4_ = {0};
-	MediaSource* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	MediaSource* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	MediaSource* _tmp11_ = NULL;
-	MediaSource* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
-	TagSourceCollection* _tmp14_ = NULL;
-	TagSourceCollection* _tmp15_ = NULL;
+	MediaSource* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	MediaSource* _tmp8_;
+	gchar* _tmp9_;
+	gchar* _tmp10_;
+	MediaSource* _tmp11_;
+	MediaSource* _tmp12_;
+	gint _tmp13_;
+	TagSourceCollection* _tmp14_;
+	TagSourceCollection* _tmp15_;
 	gboolean _tmp16_ = FALSE;
-	MediaSource* _tmp17_ = NULL;
-	MediaSource* _tmp19_ = NULL;
-	MediaSource* _tmp20_ = NULL;
+	MediaSource* _tmp17_;
+	MediaSource* _tmp19_;
+	MediaSource* _tmp20_;
 	Dimensions _tmp21_ = {0};
-	gint _tmp22_ = 0;
+	gint _tmp22_;
 	Dimensions _tmp23_ = {0};
 #line 49 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (media), NULL);
@@ -683,7 +683,7 @@ Thumbnail* thumbnail_construct (GType object_type, MediaSource* media, gint scal
 		_tmp16_ = TRUE;
 #line 685 "Thumbnail.c"
 	} else {
-		MediaSource* _tmp18_ = NULL;
+		MediaSource* _tmp18_;
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp18_ = media;
 #line 59 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -729,11 +729,11 @@ Thumbnail* thumbnail_new (MediaSource* media, gint scale) {
 
 static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 	GeeCollection* tags = NULL;
-	TagSourceCollection* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	GeeSortedSet* _tmp2_ = NULL;
+	TagSourceCollection* _tmp0_;
+	MediaSource* _tmp1_;
+	GeeSortedSet* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	GeeCollection* _tmp4_ = NULL;
+	GeeCollection* _tmp4_;
 #line 80 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 81 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -752,9 +752,9 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 		_tmp3_ = TRUE;
 #line 754 "Thumbnail.c"
 	} else {
-		GeeCollection* _tmp5_ = NULL;
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
+		GeeCollection* _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = tags;
 #line 82 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -771,7 +771,7 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 		checkerboard_item_clear_tags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 773 "Thumbnail.c"
 	} else {
-		GeeCollection* _tmp8_ = NULL;
+		GeeCollection* _tmp8_;
 #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = tags;
 #line 85 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -785,15 +785,15 @@ static void thumbnail_update_tags (Thumbnail* self, gboolean init) {
 
 
 static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource* container, GeeCollection* added, gboolean relinking, GeeCollection* removed, gboolean unlinking) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	GeeCollection* _tmp2_ = NULL;
+	GeeCollection* _tmp2_;
 	gboolean tag_added = FALSE;
 	gboolean _tmp6_ = FALSE;
-	GeeCollection* _tmp7_ = NULL;
+	GeeCollection* _tmp7_;
 	gboolean tag_removed = FALSE;
 	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp12_;
 #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 88 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -815,9 +815,9 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp2_ != NULL) {
 #line 818 "Thumbnail.c"
-		GeeCollection* _tmp3_ = NULL;
-		MediaSource* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
+		GeeCollection* _tmp3_;
+		MediaSource* _tmp4_;
+		gboolean _tmp5_;
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = added;
 #line 93 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -839,9 +839,9 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != NULL) {
 #line 842 "Thumbnail.c"
-		GeeCollection* _tmp8_ = NULL;
-		MediaSource* _tmp9_ = NULL;
-		gboolean _tmp10_ = FALSE;
+		GeeCollection* _tmp8_;
+		MediaSource* _tmp9_;
+		gboolean _tmp10_;
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = removed;
 #line 94 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -866,7 +866,7 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 		_tmp11_ = TRUE;
 #line 868 "Thumbnail.c"
 	} else {
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp13_;
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp13_ = tag_removed;
 #line 97 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -883,7 +883,7 @@ static void thumbnail_on_tag_contents_altered (Thumbnail* self, ContainerSource*
 
 
 static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 101 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -898,12 +898,12 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 	}
 	{
 		GeeIterator* _object_it = NULL;
-		GeeMap* _tmp1_ = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeSet* _tmp3_ = NULL;
-		GeeSet* _tmp4_ = NULL;
-		GeeIterator* _tmp5_ = NULL;
-		GeeIterator* _tmp6_ = NULL;
+		GeeMap* _tmp1_;
+		GeeSet* _tmp2_;
+		GeeSet* _tmp3_;
+		GeeSet* _tmp4_;
+		GeeIterator* _tmp5_;
+		GeeIterator* _tmp6_;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = altered;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -923,17 +923,17 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		while (TRUE) {
 #line 926 "Thumbnail.c"
-			GeeIterator* _tmp7_ = NULL;
-			gboolean _tmp8_ = FALSE;
+			GeeIterator* _tmp7_;
+			gboolean _tmp8_;
 			DataObject* object = NULL;
-			GeeIterator* _tmp9_ = NULL;
-			gpointer _tmp10_ = NULL;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
 			Tag* tag = NULL;
-			DataObject* _tmp11_ = NULL;
-			Tag* _tmp12_ = NULL;
-			Tag* _tmp13_ = NULL;
-			MediaSource* _tmp14_ = NULL;
-			gboolean _tmp15_ = FALSE;
+			DataObject* _tmp11_;
+			Tag* _tmp12_;
+			Tag* _tmp13_;
+			MediaSource* _tmp14_;
+			gboolean _tmp15_;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp7_ = _object_it;
 #line 105 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -989,10 +989,10 @@ static void thumbnail_on_tags_altered (Thumbnail* self, GeeMap* altered) {
 
 static void thumbnail_update_title (Thumbnail* self, gboolean init) {
 	gchar* title = NULL;
-	MediaSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	MediaSource* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 116 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 117 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1011,13 +1011,13 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) {
 		checkerboard_item_clear_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 1013 "Thumbnail.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = init;
 #line 120 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (!_tmp4_) {
 #line 1020 "Thumbnail.c"
-			const gchar* _tmp5_ = NULL;
+			const gchar* _tmp5_;
 #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp5_ = title;
 #line 121 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1037,10 +1037,10 @@ static void thumbnail_update_title (Thumbnail* self, gboolean init) {
 
 static void thumbnail_update_comment (Thumbnail* self, gboolean init) {
 	gchar* comment = NULL;
-	MediaSource* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
+	MediaSource* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gboolean _tmp3_;
 #line 126 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 127 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1059,13 +1059,13 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) {
 		checkerboard_item_clear_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 1061 "Thumbnail.c"
 	} else {
-		gboolean _tmp4_ = FALSE;
+		gboolean _tmp4_;
 #line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp4_ = init;
 #line 130 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (!_tmp4_) {
 #line 1068 "Thumbnail.c"
-			const gchar* _tmp5_ = NULL;
+			const gchar* _tmp5_;
 #line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp5_ = comment;
 #line 131 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1086,10 +1086,10 @@ static void thumbnail_update_comment (Thumbnail* self, gboolean init) {
 static void thumbnail_real_notify_altered (DataObject* base, Alteration* alteration) {
 	Thumbnail * self;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
+	gboolean _tmp1_;
 	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	Alteration* _tmp8_ = NULL;
+	gboolean _tmp5_;
+	Alteration* _tmp8_;
 #line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 136 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1099,8 +1099,8 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat
 #line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp1_) {
 #line 1102 "Thumbnail.c"
-		Alteration* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		Alteration* _tmp2_;
+		gboolean _tmp3_;
 #line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp2_ = alteration;
 #line 137 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1124,8 +1124,8 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat
 #line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp5_) {
 #line 1127 "Thumbnail.c"
-		Alteration* _tmp6_ = NULL;
-		gboolean _tmp7_ = FALSE;
+		Alteration* _tmp6_;
+		gboolean _tmp7_;
 #line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = alteration;
 #line 139 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1154,8 +1154,8 @@ static void thumbnail_real_notify_altered (DataObject* base, Alteration* alterat
 
 MediaSource* thumbnail_get_media_source (Thumbnail* self) {
 	MediaSource* result = NULL;
-	MediaSource* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	MediaSource* _tmp1_;
 #line 145 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_THUMBNAIL (self), NULL);
 #line 146 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1172,12 +1172,12 @@ MediaSource* thumbnail_get_media_source (Thumbnail* self) {
 
 gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	void* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	gint64 _tmp5_ = 0LL;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	gint64 _tmp2_;
+	void* _tmp3_;
+	MediaSource* _tmp4_;
+	gint64 _tmp5_;
 #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 154 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1200,9 +1200,9 @@ gint64 thumbnail_photo_id_ascending_comparator (void* a, void* b) {
 
 gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 158 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1220,17 +1220,17 @@ gint64 thumbnail_photo_id_descending_comparator (void* a, void* b) {
 gint64 thumbnail_title_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	GCompareFunc _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	void* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	GCompareFunc _tmp0_;
+	void* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	void* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gint64 _tmp9_ = 0LL;
-	gint64 _tmp10_ = 0LL;
+	gint64 _tmp10_;
 #line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = g_strcmp0;
 #line 162 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1260,16 +1260,16 @@ gint64 thumbnail_title_ascending_comparator (void* a, void* b) {
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp10_ != ((gint64) 0)) {
 #line 1263 "Thumbnail.c"
-		gint64 _tmp11_ = 0LL;
+		gint64 _tmp11_;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = _result_;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = _tmp11_;
 #line 1269 "Thumbnail.c"
 	} else {
-		void* _tmp12_ = NULL;
-		void* _tmp13_ = NULL;
-		gint64 _tmp14_ = 0LL;
+		void* _tmp12_;
+		void* _tmp13_;
+		gint64 _tmp14_;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp12_ = a;
 #line 163 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1291,11 +1291,11 @@ gint64 thumbnail_title_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_title_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 167 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1309,16 +1309,16 @@ gint64 thumbnail_title_descending_comparator (void* a, void* b) {
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1312 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1318 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 169 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1339,8 +1339,8 @@ gint64 thumbnail_title_descending_comparator (void* a, void* b) {
 
 gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 172 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1360,18 +1360,18 @@ gboolean thumbnail_title_comparator_predicate (DataObject* object, Alteration* a
 gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 time_a = 0LL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	time_t _tmp2_ = 0;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	time_t _tmp2_;
 	gint64 time_b = 0LL;
-	void* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	time_t _tmp5_ = 0;
+	void* _tmp3_;
+	MediaSource* _tmp4_;
+	time_t _tmp5_;
 	gint64 _result_ = 0LL;
-	gint64 _tmp6_ = 0LL;
-	gint64 _tmp7_ = 0LL;
+	gint64 _tmp6_;
+	gint64 _tmp7_;
 	gint64 _tmp8_ = 0LL;
-	gint64 _tmp9_ = 0LL;
+	gint64 _tmp9_;
 #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 177 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1399,16 +1399,16 @@ gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) {
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp9_ != ((gint64) 0)) {
 #line 1402 "Thumbnail.c"
-		gint64 _tmp10_ = 0LL;
+		gint64 _tmp10_;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp10_ = _result_;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = _tmp10_;
 #line 1408 "Thumbnail.c"
 	} else {
-		void* _tmp11_ = NULL;
-		void* _tmp12_ = NULL;
-		gint64 _tmp13_ = 0LL;
+		void* _tmp11_;
+		void* _tmp12_;
+		gint64 _tmp13_;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp11_ = a;
 #line 181 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1430,11 +1430,11 @@ gint64 thumbnail_exposure_time_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 185 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1448,16 +1448,16 @@ gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) {
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1451 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1457 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 187 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1478,8 +1478,8 @@ gint64 thumbnail_exposure_time_desending_comparator (void* a, void* b) {
 
 gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 190 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1498,8 +1498,8 @@ gboolean thumbnail_exposure_time_comparator_predicate (DataObject* object, Alter
 
 gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 194 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1519,35 +1519,35 @@ gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration
 gint64 thumbnail_filename_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gchar* path_a = NULL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
 	gchar* path_b = NULL;
-	void* _tmp8_ = NULL;
-	MediaSource* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	void* _tmp8_;
+	MediaSource* _tmp9_;
+	GFile* _tmp10_;
+	GFile* _tmp11_;
+	gchar* _tmp12_;
+	gchar* _tmp13_;
+	gchar* _tmp14_;
+	gchar* _tmp15_;
 	gint64 _result_ = 0LL;
-	GCompareFunc _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	gint64 _tmp24_ = 0LL;
+	GCompareFunc _tmp16_;
+	const gchar* _tmp17_;
+	gchar* _tmp18_;
+	gchar* _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
+	gchar* _tmp22_;
+	gint _tmp23_;
+	gint64 _tmp24_;
 	gint64 _tmp25_ = 0LL;
-	gint64 _tmp26_ = 0LL;
+	gint64 _tmp26_;
 #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 199 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1621,16 +1621,16 @@ gint64 thumbnail_filename_ascending_comparator (void* a, void* b) {
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp26_ != ((gint64) 0)) {
 #line 1624 "Thumbnail.c"
-		gint64 _tmp27_ = 0LL;
+		gint64 _tmp27_;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp27_ = _result_;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp25_ = _tmp27_;
 #line 1630 "Thumbnail.c"
 	} else {
-		void* _tmp28_ = NULL;
-		void* _tmp29_ = NULL;
-		gint64 _tmp30_ = 0LL;
+		void* _tmp28_;
+		void* _tmp29_;
+		gint64 _tmp30_;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp28_ = a;
 #line 204 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1656,11 +1656,11 @@ gint64 thumbnail_filename_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_filename_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 208 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1674,16 +1674,16 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b) {
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1677 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1683 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 210 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1705,14 +1705,14 @@ gint64 thumbnail_filename_descending_comparator (void* a, void* b) {
 gint64 thumbnail_rating_ascending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	Rating _tmp2_ = 0;
-	void* _tmp3_ = NULL;
-	MediaSource* _tmp4_ = NULL;
-	Rating _tmp5_ = 0;
+	void* _tmp0_;
+	MediaSource* _tmp1_;
+	Rating _tmp2_;
+	void* _tmp3_;
+	MediaSource* _tmp4_;
+	Rating _tmp5_;
 	gint64 _tmp6_ = 0LL;
-	gint64 _tmp7_ = 0LL;
+	gint64 _tmp7_;
 #line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = a;
 #line 214 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1732,16 +1732,16 @@ gint64 thumbnail_rating_ascending_comparator (void* a, void* b) {
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != ((gint64) 0)) {
 #line 1735 "Thumbnail.c"
-		gint64 _tmp8_ = 0LL;
+		gint64 _tmp8_;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = _result_;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = _tmp8_;
 #line 1741 "Thumbnail.c"
 	} else {
-		void* _tmp9_ = NULL;
-		void* _tmp10_ = NULL;
-		gint64 _tmp11_ = 0LL;
+		void* _tmp9_;
+		void* _tmp10_;
+		gint64 _tmp11_;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = a;
 #line 216 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1763,11 +1763,11 @@ gint64 thumbnail_rating_ascending_comparator (void* a, void* b) {
 gint64 thumbnail_rating_descending_comparator (void* a, void* b) {
 	gint64 result = 0LL;
 	gint64 _result_ = 0LL;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
+	void* _tmp0_;
+	void* _tmp1_;
+	gint64 _tmp2_;
 	gint64 _tmp3_ = 0LL;
-	gint64 _tmp4_ = 0LL;
+	gint64 _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = b;
 #line 220 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1781,16 +1781,16 @@ gint64 thumbnail_rating_descending_comparator (void* a, void* b) {
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != ((gint64) 0)) {
 #line 1784 "Thumbnail.c"
-		gint64 _tmp5_ = 0LL;
+		gint64 _tmp5_;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = _result_;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = _tmp5_;
 #line 1790 "Thumbnail.c"
 	} else {
-		void* _tmp6_ = NULL;
-		void* _tmp7_ = NULL;
-		gint64 _tmp8_ = 0LL;
+		void* _tmp6_;
+		void* _tmp7_;
+		gint64 _tmp8_;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp6_ = a;
 #line 222 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1811,8 +1811,8 @@ gint64 thumbnail_rating_descending_comparator (void* a, void* b) {
 
 gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration* alteration) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 #line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
 #line 225 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1831,11 +1831,11 @@ gboolean thumbnail_rating_comparator_predicate (DataObject* object, Alteration*
 
 static void thumbnail_real_thumbnail_altered (ThumbnailView* base) {
 	Thumbnail * self;
-	MediaSource* _tmp0_ = NULL;
+	MediaSource* _tmp0_;
 	Dimensions _tmp1_ = {0};
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	Dimensions _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 #line 229 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 230 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1870,12 +1870,12 @@ static void thumbnail_real_thumbnail_altered (ThumbnailView* base) {
 
 static void thumbnail_real_notify_collection_property_set (DataObject* base, const gchar* name, GValue* old, GValue* val) {
 	Thumbnail * self;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 	GQuark _tmp3_ = 0U;
-	const gchar* _tmp5_ = NULL;
-	GValue* _tmp6_ = NULL;
-	GValue _tmp7_ = {0};
+	const gchar* _tmp5_;
+	GValue* _tmp6_;
+	GValue _tmp7_;
 #line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 241 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1895,7 +1895,7 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con
 #line 1896 "Thumbnail.c"
 			default:
 			{
-				GValue _tmp4_ = {0};
+				GValue _tmp4_;
 #line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				_tmp4_ = *val;
 #line 244 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1932,18 +1932,18 @@ static void thumbnail_real_notify_collection_property_set (DataObject* base, con
 
 
 static void thumbnail_resize (Thumbnail* self, gint new_scale) {
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gint _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	Dimensions _tmp10_ = {0};
-	gboolean _tmp11_ = FALSE;
+	gboolean _tmp11_;
 #line 255 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 256 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1990,8 +1990,8 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 	if (_tmp11_) {
 #line 1992 "Thumbnail.c"
 		GdkPixbuf* resizable = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-		GdkPixbuf* _tmp17_ = NULL;
+		GdkPixbuf* _tmp12_;
+		GdkPixbuf* _tmp17_;
 #line 272 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		resizable = NULL;
 #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -1999,8 +1999,8 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 #line 273 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (_tmp12_ != NULL) {
 #line 2002 "Thumbnail.c"
-			GdkPixbuf* _tmp13_ = NULL;
-			GdkPixbuf* _tmp14_ = NULL;
+			GdkPixbuf* _tmp13_;
+			GdkPixbuf* _tmp14_;
 #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp13_ = self->priv->unscaled_pixbuf;
 #line 274 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2011,13 +2011,13 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 			resizable = _tmp14_;
 #line 2013 "Thumbnail.c"
 		} else {
-			gboolean _tmp15_ = FALSE;
+			gboolean _tmp15_;
 #line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp15_ = checkerboard_item_has_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 275 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			if (_tmp15_) {
 #line 2020 "Thumbnail.c"
-				GdkPixbuf* _tmp16_ = NULL;
+				GdkPixbuf* _tmp16_;
 #line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 				_tmp16_ = checkerboard_item_get_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
 #line 276 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2032,10 +2032,10 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 #line 278 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		if (_tmp17_ != NULL) {
 #line 2035 "Thumbnail.c"
-			GdkPixbuf* _tmp18_ = NULL;
-			Dimensions _tmp19_ = {0};
-			GdkPixbuf* _tmp20_ = NULL;
-			GdkPixbuf* _tmp21_ = NULL;
+			GdkPixbuf* _tmp18_;
+			Dimensions _tmp19_;
+			GdkPixbuf* _tmp20_;
+			GdkPixbuf* _tmp21_;
 #line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 			_tmp18_ = resizable;
 #line 279 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2056,7 +2056,7 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 		_g_object_unref0 (resizable);
 #line 2058 "Thumbnail.c"
 	} else {
-		Dimensions _tmp22_ = {0};
+		Dimensions _tmp22_;
 #line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp22_ = self->priv->dim;
 #line 283 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2067,7 +2067,7 @@ static void thumbnail_resize (Thumbnail* self, gint new_scale) {
 
 
 static void thumbnail_paint_empty (Thumbnail* self) {
-	Dimensions _tmp0_ = {0};
+	Dimensions _tmp0_;
 #line 287 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 288 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2092,10 +2092,10 @@ static void _thumbnail_on_low_quality_fetched_thumbnail_cache_async_fetch_callba
 
 
 static void thumbnail_schedule_low_quality_fetch (Thumbnail* self) {
-	GCancellable* _tmp0_ = NULL;
-	MediaSource* _tmp1_ = NULL;
-	Dimensions _tmp2_ = {0};
-	GCancellable* _tmp3_ = NULL;
+	GCancellable* _tmp0_;
+	MediaSource* _tmp1_;
+	Dimensions _tmp2_;
+	GCancellable* _tmp3_;
 #line 293 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 294 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2128,7 +2128,7 @@ static gboolean _thumbnail_on_schedule_high_quality_gsource_func (gpointer self)
 
 
 static void thumbnail_delayed_high_quality_fetch (Thumbnail* self) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 301 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 302 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2158,9 +2158,9 @@ static void _thumbnail_on_high_quality_fetched_thumbnail_cache_async_fetch_callb
 
 static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) {
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GCancellable* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp0_;
+	GCancellable* _tmp1_;
+	gboolean _tmp2_;
 #line 312 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_val_if_fail (IS_THUMBNAIL (self), FALSE);
 #line 313 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2188,10 +2188,10 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) {
 #line 322 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp2_) {
 #line 2191 "Thumbnail.c"
-		MediaSource* _tmp3_ = NULL;
-		gint _tmp4_ = 0;
-		Dimensions _tmp5_ = {0};
-		GCancellable* _tmp6_ = NULL;
+		MediaSource* _tmp3_;
+		gint _tmp4_;
+		Dimensions _tmp5_;
+		GCancellable* _tmp6_;
 #line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp3_ = self->priv->media;
 #line 323 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2215,7 +2215,7 @@ static gboolean thumbnail_on_schedule_high_quality (Thumbnail* self) {
 
 
 static void thumbnail_cancel_async_fetch (Thumbnail* self) {
-	GCancellable* _tmp0_ = NULL;
+	GCancellable* _tmp0_;
 #line 332 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2223,7 +2223,7 @@ static void thumbnail_cancel_async_fetch (Thumbnail* self) {
 #line 334 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2226 "Thumbnail.c"
-		GCancellable* _tmp1_ = NULL;
+		GCancellable* _tmp1_;
 #line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 335 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2234,9 +2234,9 @@ static void thumbnail_cancel_async_fetch (Thumbnail* self) {
 
 
 static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) {
-	GError* _tmp0_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	GError* _tmp0_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp8_;
 #line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 338 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2250,11 +2250,11 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 #line 340 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2253 "Thumbnail.c"
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		gchar* _tmp1_;
+		gchar* _tmp2_;
+		gint _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 341 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2277,7 +2277,7 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 #line 344 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_ != NULL) {
 #line 2279 "Thumbnail.c"
-		GdkPixbuf* _tmp7_ = NULL;
+		GdkPixbuf* _tmp7_;
 #line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = pixbuf;
 #line 345 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2289,8 +2289,8 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 #line 347 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp8_ != NULL) {
 #line 2291 "Thumbnail.c"
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf* _tmp10_;
 #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = unscaled;
 #line 348 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2308,9 +2308,9 @@ static void thumbnail_on_low_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf
 
 
 static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbuf, GdkPixbuf* unscaled, Dimensions* dim, GdkInterpType interp, GError* err) {
-	GError* _tmp0_ = NULL;
-	GdkPixbuf* _tmp6_ = NULL;
-	GdkPixbuf* _tmp8_ = NULL;
+	GError* _tmp0_;
+	GdkPixbuf* _tmp6_;
+	GdkPixbuf* _tmp8_;
 #line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_return_if_fail (IS_THUMBNAIL (self));
 #line 353 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2324,11 +2324,11 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 #line 355 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2326 "Thumbnail.c"
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gint _tmp3_ = 0;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		gchar* _tmp1_;
+		gchar* _tmp2_;
+		gint _tmp3_;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
 #line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
 #line 356 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2351,7 +2351,7 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 #line 359 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_ != NULL) {
 #line 2352 "Thumbnail.c"
-		GdkPixbuf* _tmp7_ = NULL;
+		GdkPixbuf* _tmp7_;
 #line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = pixbuf;
 #line 360 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2363,8 +2363,8 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 #line 362 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp8_ != NULL) {
 #line 2364 "Thumbnail.c"
-		GdkPixbuf* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
+		GdkPixbuf* _tmp9_;
+		GdkPixbuf* _tmp10_;
 #line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = unscaled;
 #line 363 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2380,7 +2380,7 @@ static void thumbnail_on_high_quality_fetched (Thumbnail* self, GdkPixbuf* pixbu
 
 static void thumbnail_real_exposed (CheckerboardItem* base) {
 	Thumbnail * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 366 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 367 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2423,11 +2423,11 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base,
 	Thumbnail * self;
 	GdkPixbuf* result = NULL;
 	Flaggable* flaggable = NULL;
-	MediaSource* _tmp0_ = NULL;
-	Flaggable* _tmp1_ = NULL;
+	MediaSource* _tmp0_;
+	Flaggable* _tmp1_;
 	GdkPixbuf* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-	Flaggable* _tmp4_ = NULL;
+	Flaggable* _tmp4_;
 #line 387 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 388 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2441,8 +2441,8 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base,
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp4_ != NULL) {
 #line 2442 "Thumbnail.c"
-		Flaggable* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		Flaggable* _tmp5_;
+		gboolean _tmp6_;
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp5_ = flaggable;
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2458,7 +2458,7 @@ static GdkPixbuf* thumbnail_real_get_top_right_trinket (CheckerboardItem* base,
 #line 390 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp3_) {
 #line 2459 "Thumbnail.c"
-		GdkPixbuf* _tmp7_ = NULL;
+		GdkPixbuf* _tmp7_;
 #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp7_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
 #line 391 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2496,15 +2496,15 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
 	Thumbnail * self;
 	GdkPixbuf* result = NULL;
 	Rating rating = 0;
-	MediaSource* _tmp0_ = NULL;
-	Rating _tmp1_ = 0;
+	MediaSource* _tmp0_;
+	Rating _tmp1_;
 	gboolean show_ratings = FALSE;
 	GValue* _tmp2_ = NULL;
 	GValue _tmp3_ = {0};
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp4_;
 	GdkPixbuf* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-	Rating _tmp7_ = 0;
+	Rating _tmp7_;
 #line 394 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_THUMBNAIL, Thumbnail);
 #line 395 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2532,7 +2532,7 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp7_ != RATING_UNRATED) {
 #line 2533 "Thumbnail.c"
-		gboolean _tmp8_ = FALSE;
+		gboolean _tmp8_;
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp8_ = show_ratings;
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2546,9 +2546,9 @@ static GdkPixbuf* thumbnail_real_get_bottom_left_trinket (CheckerboardItem* base
 #line 398 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp6_) {
 #line 2547 "Thumbnail.c"
-		Rating _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		GdkPixbuf* _tmp11_ = NULL;
+		Rating _tmp9_;
+		gint _tmp10_;
+		GdkPixbuf* _tmp11_;
 #line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp9_ = rating;
 #line 399 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2587,7 +2587,7 @@ gint thumbnail_get_MIN_SCALE (void) {
 
 gint thumbnail_get_MAX_SCALE (void) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_LARGEST);
 #line 23 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2600,7 +2600,7 @@ gint thumbnail_get_MAX_SCALE (void) {
 
 gint thumbnail_get_DEFAULT_SCALE (void) {
 	gint result;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	_tmp0_ = thumbnail_cache_size_get_scale (THUMBNAIL_CACHE_SIZE_MEDIUM);
 #line 28 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2617,19 +2617,19 @@ static void thumbnail_class_init (ThumbnailClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	g_type_class_add_private (klass, sizeof (ThumbnailPrivate));
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((DataObjectClass *) klass)->notify_altered = (void (*)(DataObject*, Alteration*)) thumbnail_real_notify_altered;
+	((DataObjectClass *) klass)->notify_altered = (void (*) (DataObject *, Alteration*)) thumbnail_real_notify_altered;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*)(ThumbnailView*)) thumbnail_real_thumbnail_altered;
+	((ThumbnailViewClass *) klass)->thumbnail_altered = (void (*) (ThumbnailView *)) thumbnail_real_thumbnail_altered;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((DataObjectClass *) klass)->notify_collection_property_set = (void (*)(DataObject*, const gchar*, GValue*, GValue*)) thumbnail_real_notify_collection_property_set;
+	((DataObjectClass *) klass)->notify_collection_property_set = (void (*) (DataObject *, const gchar*, GValue*, GValue*)) thumbnail_real_notify_collection_property_set;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->exposed = (void (*)(CheckerboardItem*)) thumbnail_real_exposed;
+	((CheckerboardItemClass *) klass)->exposed = (void (*) (CheckerboardItem *)) thumbnail_real_exposed;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->unexposed = (void (*)(CheckerboardItem*)) thumbnail_real_unexposed;
+	((CheckerboardItemClass *) klass)->unexposed = (void (*) (CheckerboardItem *)) thumbnail_real_unexposed;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) thumbnail_real_get_top_right_trinket;
+	((CheckerboardItemClass *) klass)->get_top_right_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) thumbnail_real_get_top_right_trinket;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
-	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*)(CheckerboardItem*, gint)) thumbnail_real_get_bottom_left_trinket;
+	((CheckerboardItemClass *) klass)->get_bottom_left_trinket = (GdkPixbuf* (*) (CheckerboardItem *, gint)) thumbnail_real_get_bottom_left_trinket;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_thumbnail_get_property;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2655,13 +2655,13 @@ static void thumbnail_instance_init (Thumbnail * self) {
 }
 
 
-static void thumbnail_finalize (GObject* obj) {
+static void thumbnail_finalize (GObject * obj) {
 	Thumbnail * self;
-	GCancellable* _tmp0_ = NULL;
-	TagSourceCollection* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	TagSourceCollection* _tmp4_ = NULL;
-	guint _tmp5_ = 0U;
+	GCancellable* _tmp0_;
+	TagSourceCollection* _tmp2_;
+	guint _tmp3_;
+	TagSourceCollection* _tmp4_;
+	guint _tmp5_;
 #line 7 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_THUMBNAIL, Thumbnail);
 #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala"
@@ -2669,7 +2669,7 @@ static void thumbnail_finalize (GObject* obj) {
 #line 73 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 	if (_tmp0_ != NULL) {
 #line 2670 "Thumbnail.c"
-		GCancellable* _tmp1_ = NULL;
+		GCancellable* _tmp1_;
 #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala"
 		_tmp1_ = self->priv->cancellable;
 #line 74 "/home/jens/Source/shotwell/src/Thumbnail.vala"