Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 326 insertions, 339 deletions

diff --git a/src/util/file.c b/src/util/file.c
index 3f4b228..2afe738 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.34.7, the Vala compiler
+/* file.c generated by valac 0.36.6, the Vala compiler
  * generated from file.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -29,7 +29,7 @@ typedef gboolean (*ProgressMonitor) (guint64 current, guint64 total, gboolean do
 
 gboolean claim_file (GFile* file, GError** error);
 GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext);
 glong find_last_offset (const gchar* str, gchar c);
 guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error);
 void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error);
@@ -60,9 +60,9 @@ gboolean claim_file (GFile* file, GError** error) {
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 62 "file.c"
 	{
-		GFile* _tmp0_ = NULL;
-		GFileOutputStream* _tmp1_ = NULL;
-		GFileOutputStream* _tmp2_ = NULL;
+		GFile* _tmp0_;
+		GFileOutputStream* _tmp1_;
+		GFileOutputStream* _tmp2_;
 #line 14 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = file;
 #line 14 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -86,7 +86,7 @@ gboolean claim_file (GFile* file, GError** error) {
 	__catch0_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp3_ = NULL;
+		GError* _tmp3_;
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
 		err = _inner_error_;
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -96,13 +96,13 @@ gboolean claim_file (GFile* file, GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (!g_error_matches (_tmp3_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
 #line 99 "file.c"
-			GFile* _tmp4_ = NULL;
-			gchar* _tmp5_ = NULL;
-			gchar* _tmp6_ = NULL;
-			GError* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-			GError* _tmp9_ = NULL;
-			GError* _tmp10_ = NULL;
+			GFile* _tmp4_;
+			gchar* _tmp5_;
+			gchar* _tmp6_;
+			GError* _tmp7_;
+			const gchar* _tmp8_;
+			GError* _tmp9_;
+			GError* _tmp10_;
 #line 21 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp4_ = file;
 #line 21 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -149,21 +149,21 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 	gboolean _vala_collision = FALSE;
 	GFile* result = NULL;
 	GFile* file = NULL;
-	GFile* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp0_;
+	const gchar* _tmp1_;
+	GFile* _tmp2_;
 	gboolean _tmp3_ = FALSE;
-	GFile* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	GFile* _tmp4_;
+	gboolean _tmp5_;
 	gchar* name = NULL;
 	gchar* ext = NULL;
-	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp6_;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-	GFile* _tmp28_ = NULL;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
+	GFile* _tmp28_;
+	gchar* _tmp29_;
+	gchar* _tmp30_;
+	const gchar* _tmp31_;
 	GError * _inner_error_ = NULL;
 #line 36 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
@@ -236,21 +236,21 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 			while (TRUE) {
 #line 239 "file.c"
-				gint _tmp11_ = 0;
+				gint _tmp11_;
 				gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
+				const gchar* _tmp13_;
 				gchar* new_name = NULL;
-				gchar* _tmp21_ = NULL;
-				GFile* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				GFile* _tmp24_ = NULL;
+				gchar* _tmp21_;
+				GFile* _tmp22_;
+				const gchar* _tmp23_;
+				GFile* _tmp24_;
 				gboolean _tmp25_ = FALSE;
-				GFile* _tmp26_ = NULL;
-				gboolean _tmp27_ = FALSE;
+				GFile* _tmp26_;
+				gboolean _tmp27_;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (!_tmp9_) {
 #line 253 "file.c"
-					gint _tmp10_ = 0;
+					gint _tmp10_;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp10_ = ctr;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -272,10 +272,10 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (_tmp13_ != NULL) {
 #line 275 "file.c"
-					const gchar* _tmp14_ = NULL;
-					gint _tmp15_ = 0;
-					const gchar* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
+					const gchar* _tmp14_;
+					gint _tmp15_;
+					const gchar* _tmp16_;
+					gchar* _tmp17_;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp14_ = name;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -290,9 +290,9 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_tmp12_ = _tmp17_;
 #line 292 "file.c"
 				} else {
-					const gchar* _tmp18_ = NULL;
-					gint _tmp19_ = 0;
-					gchar* _tmp20_ = NULL;
+					const gchar* _tmp18_;
+					gint _tmp19_;
+					gchar* _tmp20_;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp18_ = name;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -408,41 +408,41 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
 #line 428 "file.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 436 "file.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 448 "file.c"
 	}
@@ -453,133 +453,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
 #line 472 "file.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
 #line 478 "file.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
 #line 482 "file.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
 #line 486 "file.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
 #line 498 "file.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
 #line 508 "file.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
 #line 514 "file.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
 #line 528 "file.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 #line 538 "file.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
 #line 544 "file.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
 #line 553 "file.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 573 "file.c"
 }
 
 
-void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
+void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext) {
 	gchar* _vala_name = NULL;
 	gchar* _vala_ext = NULL;
 	glong offset = 0L;
-	const gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	glong _tmp2_ = 0L;
+	const gchar* _tmp0_;
+	glong _tmp1_;
+	glong _tmp2_;
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_if_fail (basename != NULL);
 #line 66 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -593,8 +593,8 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 #line 67 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ <= ((glong) 0)) {
 #line 596 "file.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 68 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = basename;
 #line 68 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -609,12 +609,12 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 		_vala_ext = NULL;
 #line 611 "file.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-		glong _tmp6_ = 0L;
-		gchar* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		glong _tmp9_ = 0L;
-		gchar* _tmp10_ = NULL;
+		const gchar* _tmp5_;
+		glong _tmp6_;
+		gchar* _tmp7_;
+		const gchar* _tmp8_;
+		glong _tmp9_;
+		gchar* _tmp10_;
 #line 71 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp5_ = basename;
 #line 71 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -663,9 +663,9 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GError** error) {
 	guint64 result = 0ULL;
 	GFileType type = 0;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
-	GFileType _tmp2_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
+	GFileType _tmp2_;
 	GFileEnumerator* enumerator = NULL;
 	guint64 total_bytes = 0ULL;
 	GFileInfo* info = NULL;
@@ -686,17 +686,17 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	if (_tmp2_ == G_FILE_TYPE_REGULAR) {
 #line 688 "file.c"
 		GFileInfo* info = NULL;
-		GFileInfo* _tmp17_ = NULL;
-		gint64 _tmp18_ = 0LL;
+		GFileInfo* _tmp17_;
+		gint64 _tmp18_;
 #line 80 "/home/jens/Source/shotwell/src/util/file.vala"
 		info = NULL;
 #line 694 "file.c"
 		{
 			GFileInfo* _tmp3_ = NULL;
-			GFile* _tmp4_ = NULL;
-			GCancellable* _tmp5_ = NULL;
-			GFileInfo* _tmp6_ = NULL;
-			GFileInfo* _tmp7_ = NULL;
+			GFile* _tmp4_;
+			GCancellable* _tmp5_;
+			GFileInfo* _tmp6_;
+			GFileInfo* _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp4_ = file_or_dir;
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -726,12 +726,12 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 		__catch1_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp8_ = NULL;
-			GFile* _tmp11_ = NULL;
-			gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-			GError* _tmp14_ = NULL;
-			const gchar* _tmp15_ = NULL;
+			GError* _tmp8_;
+			GFile* _tmp11_;
+			gchar* _tmp12_;
+			gchar* _tmp13_;
+			GError* _tmp14_;
+			const gchar* _tmp15_;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			err = _inner_error_;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -741,8 +741,8 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 #line 85 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
 #line 744 "file.c"
-				GError* _tmp9_ = NULL;
-				GError* _tmp10_ = NULL;
+				GError* _tmp9_;
+				GError* _tmp10_;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp9_ = err;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -803,7 +803,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 		return result;
 #line 805 "file.c"
 	} else {
-		GFileType _tmp19_ = 0;
+		GFileType _tmp19_;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp19_ = type;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -817,11 +817,11 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	}
 	{
 		GFileEnumerator* _tmp20_ = NULL;
-		GFile* _tmp21_ = NULL;
-		GCancellable* _tmp22_ = NULL;
-		GFileEnumerator* _tmp23_ = NULL;
-		GFileEnumerator* _tmp24_ = NULL;
-		GFileEnumerator* _tmp25_ = NULL;
+		GFile* _tmp21_;
+		GCancellable* _tmp22_;
+		GFileEnumerator* _tmp23_;
+		GFileEnumerator* _tmp24_;
+		GFileEnumerator* _tmp25_;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp21_ = file_or_dir;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -866,9 +866,9 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	{
 		GError* err = NULL;
 		gboolean _tmp26_ = FALSE;
-		GError* _tmp27_ = NULL;
-		GError* _tmp29_ = NULL;
-		GError* _tmp30_ = NULL;
+		GError* _tmp27_;
+		GError* _tmp29_;
+		GError* _tmp30_;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		err = _inner_error_;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -881,7 +881,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_tmp26_ = TRUE;
 #line 883 "file.c"
 		} else {
-			GError* _tmp28_ = NULL;
+			GError* _tmp28_;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp28_ = err;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -932,21 +932,21 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	while (TRUE) {
 #line 934 "file.c"
 		GFileInfo* _tmp32_ = NULL;
-		GFileEnumerator* _tmp33_ = NULL;
-		GCancellable* _tmp34_ = NULL;
-		GFileInfo* _tmp35_ = NULL;
-		GFileInfo* _tmp37_ = NULL;
-		GFileInfo* _tmp38_ = NULL;
+		GFileEnumerator* _tmp33_;
+		GCancellable* _tmp34_;
+		GFileInfo* _tmp35_;
+		GFileInfo* _tmp37_;
+		GFileInfo* _tmp38_;
 		guint64 _tmp39_ = 0ULL;
-		GFile* _tmp40_ = NULL;
-		GFileInfo* _tmp41_ = NULL;
-		const gchar* _tmp42_ = NULL;
-		GFile* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		GCancellable* _tmp45_ = NULL;
-		guint64 _tmp46_ = 0ULL;
-		guint64 _tmp47_ = 0ULL;
-		guint64 _tmp49_ = 0ULL;
+		GFile* _tmp40_;
+		GFileInfo* _tmp41_;
+		const gchar* _tmp42_;
+		GFile* _tmp43_;
+		GFile* _tmp44_;
+		GCancellable* _tmp45_;
+		guint64 _tmp46_;
+		guint64 _tmp47_;
+		guint64 _tmp49_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp33_ = enumerator;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1045,13 +1045,13 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 
 void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor, void* monitor_target, guint64 file_count, GCancellable* cancellable, GError** error) {
 	GFileType type = 0;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
-	GFileType _tmp2_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
+	GFileType _tmp2_;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp10_ = NULL;
-	GCancellable* _tmp11_ = NULL;
-	GFileEnumerator* _tmp12_ = NULL;
+	GFile* _tmp10_;
+	GCancellable* _tmp11_;
+	GFileEnumerator* _tmp12_;
 	GFileInfo* info = NULL;
 	guint64 i = 0ULL;
 	GError * _inner_error_ = NULL;
@@ -1072,13 +1072,13 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 128 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != G_FILE_TYPE_DIRECTORY) {
 #line 1075 "file.c"
-		GFile* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
+		GFile* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		GError* _tmp8_;
+		GError* _tmp9_;
 #line 129 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = dir;
 #line 129 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1129,23 +1129,23 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 	while (TRUE) {
 #line 1131 "file.c"
 		GFileInfo* _tmp13_ = NULL;
-		GFileEnumerator* _tmp14_ = NULL;
-		GCancellable* _tmp15_ = NULL;
-		GFileInfo* _tmp16_ = NULL;
-		GFileInfo* _tmp17_ = NULL;
-		GFileInfo* _tmp18_ = NULL;
-		GFileInfo* _tmp19_ = NULL;
-		GFileType _tmp20_ = 0;
+		GFileEnumerator* _tmp14_;
+		GCancellable* _tmp15_;
+		GFileInfo* _tmp16_;
+		GFileInfo* _tmp17_;
+		GFileInfo* _tmp18_;
+		GFileInfo* _tmp19_;
+		GFileType _tmp20_;
 		gboolean _tmp21_ = FALSE;
-		GeeSet* _tmp22_ = NULL;
+		GeeSet* _tmp22_;
 		GFile* file = NULL;
-		GFile* _tmp27_ = NULL;
-		GFileInfo* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		GFile* _tmp30_ = NULL;
+		GFile* _tmp27_;
+		GFileInfo* _tmp28_;
+		const gchar* _tmp29_;
+		GFile* _tmp30_;
 		gboolean _tmp38_ = FALSE;
-		ProgressMonitor _tmp39_ = NULL;
-		void* _tmp39__target = NULL;
+		ProgressMonitor _tmp39_;
+		void* _tmp39__target;
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp14_ = enumerator;
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1201,10 +1201,10 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp22_ != NULL) {
 #line 1204 "file.c"
-			GeeSet* _tmp23_ = NULL;
-			GFileInfo* _tmp24_ = NULL;
-			const gchar* _tmp25_ = NULL;
-			gboolean _tmp26_ = FALSE;
+			GeeSet* _tmp23_;
+			GFileInfo* _tmp24_;
+			const gchar* _tmp25_;
+			gboolean _tmp26_;
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp23_ = exceptions;
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1241,8 +1241,8 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		file = _tmp30_;
 #line 1243 "file.c"
 		{
-			GFile* _tmp31_ = NULL;
-			GCancellable* _tmp32_ = NULL;
+			GFile* _tmp31_;
+			GCancellable* _tmp32_;
 #line 144 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp31_ = file;
 #line 144 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1259,11 +1259,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		__catch3_g_error:
 		{
 			GError* err = NULL;
-			GFile* _tmp33_ = NULL;
-			gchar* _tmp34_ = NULL;
-			gchar* _tmp35_ = NULL;
-			GError* _tmp36_ = NULL;
-			const gchar* _tmp37_ = NULL;
+			GFile* _tmp33_;
+			gchar* _tmp34_;
+			gchar* _tmp35_;
+			GError* _tmp36_;
+			const gchar* _tmp37_;
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
 			err = _inner_error_;
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1310,7 +1310,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp39_ != NULL) {
 #line 1313 "file.c"
-			guint64 _tmp40_ = 0ULL;
+			guint64 _tmp40_;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp40_ = file_count;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1324,11 +1324,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp38_) {
 #line 1327 "file.c"
-			ProgressMonitor _tmp41_ = NULL;
-			void* _tmp41__target = NULL;
-			guint64 _tmp42_ = 0ULL;
-			guint64 _tmp43_ = 0ULL;
-			guint64 _tmp44_ = 0ULL;
+			ProgressMonitor _tmp41_;
+			void* _tmp41__target;
+			guint64 _tmp42_;
+			guint64 _tmp43_;
+			guint64 _tmp44_;
 #line 150 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp41_ = monitor;
 #line 150 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1362,10 +1362,10 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 time_t query_file_modified (GFile* file, GError** error) {
 	time_t result = 0;
 	GFileInfo* info = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileInfo* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFileInfo* _tmp1_;
 	GTimeVal _tmp3_ = {0};
-	glong _tmp4_ = 0L;
+	glong _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
@@ -1401,8 +1401,8 @@ time_t query_file_modified (GFile* file, GError** error) {
 
 gboolean query_is_directory (GFile* file) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 162 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1419,18 +1419,15 @@ gboolean query_is_directory (GFile* file) {
 
 gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	gboolean result = FALSE;
-	GFile* _tmp0_ = NULL;
-	GFileType _tmp1_ = 0;
+	GFile* _tmp0_;
+	GFileType _tmp1_;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileEnumerator* _tmp3_ = NULL;
-	GFileEnumerator* _tmp5_ = NULL;
+	GFile* _tmp2_;
+	GFileEnumerator* _tmp3_;
+	GFileEnumerator* _tmp5_;
 	GFileInfo* _tmp6_ = NULL;
-	GFileEnumerator* _tmp7_ = NULL;
-	GFileInfo* _tmp8_ = NULL;
-	GFileInfo* _tmp10_ = NULL;
-	GFileInfo* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GFileEnumerator* _tmp7_;
+	GFileInfo* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), FALSE);
@@ -1444,7 +1441,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 		result = FALSE;
 #line 167 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1448 "file.c"
+#line 1445 "file.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp2_ = dir;
@@ -1454,13 +1451,13 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	enumerator = _tmp3_;
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1458 "file.c"
+#line 1455 "file.c"
 		gboolean _tmp4_ = FALSE;
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 		return _tmp4_;
-#line 1464 "file.c"
+#line 1461 "file.c"
 	}
 #line 171 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp5_ = enumerator;
@@ -1472,7 +1469,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 		_g_object_unref0 (enumerator);
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1476 "file.c"
+#line 1473 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp7_ = enumerator;
@@ -1482,7 +1479,7 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	_tmp6_ = _tmp8_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1486 "file.c"
+#line 1483 "file.c"
 		gboolean _tmp9_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
@@ -1490,43 +1487,33 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 		_g_object_unref0 (enumerator);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 		return _tmp9_;
-#line 1494 "file.c"
+#line 1491 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp10_ = _tmp6_;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp6_ = NULL;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp11_ = _tmp10_;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp12_ = _tmp11_ == NULL;
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_g_object_unref0 (_tmp11_);
-#line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	result = _tmp12_;
+	result = _tmp6_ == NULL;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (_tmp6_);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (enumerator);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1514 "file.c"
+#line 1501 "file.c"
 }
 
 
 gchar* get_display_pathname (GFile* file) {
 	gchar* result = NULL;
 	gchar* path = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 	gchar* home = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	gboolean _tmp9_;
 #line 177 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 179 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1547,8 +1534,8 @@ gchar* get_display_pathname (GFile* file) {
 	_tmp5_ = home;
 #line 182 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 1551 "file.c"
-		gchar* _tmp6_ = NULL;
+#line 1538 "file.c"
+		gchar* _tmp6_;
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp6_ = g_strdup ("~");
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1559,7 +1546,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1563 "file.c"
+#line 1550 "file.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp7_ = path;
@@ -1569,15 +1556,15 @@ gchar* get_display_pathname (GFile* file) {
 	_tmp9_ = g_str_has_prefix (_tmp7_, _tmp8_);
 #line 185 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp9_) {
-#line 1573 "file.c"
-		const gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+#line 1560 "file.c"
+		const gchar* _tmp10_;
+		const gchar* _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp10_ = path;
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1604,7 +1591,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1608 "file.c"
+#line 1595 "file.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = path;
@@ -1612,20 +1599,20 @@ gchar* get_display_pathname (GFile* file) {
 	_g_free0 (home);
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1616 "file.c"
+#line 1603 "file.c"
 }
 
 
 gchar* strip_pretty_path (const gchar* path) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
+	const gchar* _tmp0_;
+	gboolean _tmp1_;
+	const gchar* _tmp4_;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar* _tmp9_;
 #line 191 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (path != NULL, NULL);
 #line 192 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1634,9 +1621,9 @@ gchar* strip_pretty_path (const gchar* path) {
 	_tmp1_ = g_str_has_prefix (_tmp0_, "~");
 #line 192 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (!_tmp1_) {
-#line 1638 "file.c"
-		const gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
+#line 1625 "file.c"
+		const gchar* _tmp2_;
+		gchar* _tmp3_;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp2_ = path;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1645,7 +1632,7 @@ gchar* strip_pretty_path (const gchar* path) {
 		result = _tmp3_;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1649 "file.c"
+#line 1636 "file.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp4_ = g_get_home_dir ();
@@ -1665,15 +1652,15 @@ gchar* strip_pretty_path (const gchar* path) {
 	result = _tmp9_;
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1669 "file.c"
+#line 1656 "file.c"
 }
 
 
 gchar* get_file_info_id (GFileInfo* info) {
 	gchar* result = NULL;
-	GFileInfo* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	GFileInfo* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 198 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), NULL);
 #line 199 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1686,7 +1673,7 @@ gchar* get_file_info_id (GFileInfo* info) {
 	result = _tmp2_;
 #line 199 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1690 "file.c"
+#line 1677 "file.c"
 }
 
 
@@ -1696,24 +1683,24 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 	g_return_if_fail (G_IS_INPUT_STREAM (input));
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 1700 "file.c"
-		guint64 _tmp0_ = 0ULL;
-		guint64 _tmp1_ = 0ULL;
+#line 1687 "file.c"
+		guint64 _tmp0_;
+		guint64 _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = skip_amount;
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (!(_tmp0_ > ((guint64) 0))) {
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1709 "file.c"
+#line 1696 "file.c"
 		}
 #line 206 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = skip_amount;
 #line 206 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp1_ >= ((guint64) G_MAXSSIZE)) {
-#line 1715 "file.c"
-			GInputStream* _tmp2_ = NULL;
-			guint64 _tmp3_ = 0ULL;
+#line 1702 "file.c"
+			GInputStream* _tmp2_;
+			guint64 _tmp3_;
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp2_ = input;
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1724,16 +1711,16 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 				g_propagate_error (error, _inner_error_);
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
 				return;
-#line 1728 "file.c"
+#line 1715 "file.c"
 			}
 #line 208 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp3_ = skip_amount;
 #line 208 "/home/jens/Source/shotwell/src/util/file.vala"
 			skip_amount = _tmp3_ - G_MAXSSIZE;
-#line 1734 "file.c"
+#line 1721 "file.c"
 		} else {
-			GInputStream* _tmp4_ = NULL;
-			guint64 _tmp5_ = 0ULL;
+			GInputStream* _tmp4_;
+			guint64 _tmp5_;
 #line 210 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp4_ = input;
 #line 210 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1746,11 +1733,11 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 				g_propagate_error (error, _inner_error_);
 #line 210 "/home/jens/Source/shotwell/src/util/file.vala"
 				return;
-#line 1750 "file.c"
+#line 1737 "file.c"
 			}
 #line 211 "/home/jens/Source/shotwell/src/util/file.vala"
 			skip_amount = (guint64) 0;
-#line 1754 "file.c"
+#line 1741 "file.c"
 		}
 	}
 }
@@ -1758,12 +1745,12 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 
 guint64 count_files_in_directory (GFile* dir, GError** error) {
 	guint64 result = 0ULL;
-	GFile* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	GFile* _tmp0_;
+	gboolean _tmp1_;
 	guint64 count = 0ULL;
 	GFileEnumerator* enumerator = NULL;
-	GFile* _tmp2_ = NULL;
-	GFileEnumerator* _tmp3_ = NULL;
+	GFile* _tmp2_;
+	GFileEnumerator* _tmp3_;
 	GFileInfo* info = NULL;
 	GError * _inner_error_ = NULL;
 #line 217 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1778,7 +1765,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 		result = (guint64) 0;
 #line 219 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1782 "file.c"
+#line 1769 "file.c"
 	}
 #line 221 "/home/jens/Source/shotwell/src/util/file.vala"
 	count = (guint64) 0;
@@ -1790,25 +1777,25 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 	enumerator = _tmp3_;
 #line 222 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1794 "file.c"
+#line 1781 "file.c"
 		guint64 _tmp4_ = 0ULL;
 #line 222 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 222 "/home/jens/Source/shotwell/src/util/file.vala"
 		return _tmp4_;
-#line 1800 "file.c"
+#line 1787 "file.c"
 	}
 #line 225 "/home/jens/Source/shotwell/src/util/file.vala"
 	info = NULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 1806 "file.c"
+#line 1793 "file.c"
 		GFileInfo* _tmp5_ = NULL;
-		GFileEnumerator* _tmp6_ = NULL;
-		GFileInfo* _tmp7_ = NULL;
-		GFileInfo* _tmp9_ = NULL;
-		GFileInfo* _tmp10_ = NULL;
-		guint64 _tmp11_ = 0ULL;
+		GFileEnumerator* _tmp6_;
+		GFileInfo* _tmp7_;
+		GFileInfo* _tmp9_;
+		GFileInfo* _tmp10_;
+		guint64 _tmp11_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp6_ = enumerator;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1817,7 +1804,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 		_tmp5_ = _tmp7_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1821 "file.c"
+#line 1808 "file.c"
 			guint64 _tmp8_ = 0ULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
@@ -1827,7 +1814,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 			_g_object_unref0 (enumerator);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			return _tmp8_;
-#line 1831 "file.c"
+#line 1818 "file.c"
 		}
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp9_ = _tmp5_;
@@ -1845,7 +1832,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 			_g_object_unref0 (_tmp5_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1849 "file.c"
+#line 1836 "file.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp11_ = count;
@@ -1853,7 +1840,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 		count = _tmp11_ + 1;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (_tmp5_);
-#line 1857 "file.c"
+#line 1844 "file.c"
 	}
 #line 229 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = count;
@@ -1863,7 +1850,7 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 	_g_object_unref0 (enumerator);
 #line 229 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1867 "file.c"
+#line 1854 "file.c"
 }
 
 
@@ -1871,7 +1858,7 @@ gboolean file_equal (GFile* a, GFile* b) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GFile* _tmp2_ = NULL;
+	GFile* _tmp2_;
 #line 233 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail ((a == NULL) || G_IS_FILE (a), FALSE);
 #line 233 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1880,24 +1867,24 @@ gboolean file_equal (GFile* a, GFile* b) {
 	_tmp2_ = a;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != NULL) {
-#line 1884 "file.c"
-		GFile* _tmp3_ = NULL;
+#line 1871 "file.c"
+		GFile* _tmp3_;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = b;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1890 "file.c"
+#line 1877 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = FALSE;
-#line 1894 "file.c"
+#line 1881 "file.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_) {
-#line 1898 "file.c"
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+#line 1885 "file.c"
+		GFile* _tmp4_;
+		GFile* _tmp5_;
+		gboolean _tmp6_;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp4_ = a;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1906,50 +1893,50 @@ gboolean file_equal (GFile* a, GFile* b) {
 		_tmp6_ = g_file_equal (_tmp4_, _tmp5_);
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = _tmp6_;
-#line 1910 "file.c"
+#line 1897 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = FALSE;
-#line 1914 "file.c"
+#line 1901 "file.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = _tmp0_;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1920 "file.c"
+#line 1907 "file.c"
 }
 
 
 guint file_hash (GFile* file) {
 	guint result = 0U;
 	guint _tmp0_ = 0U;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp1_;
 #line 238 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), 0U);
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp1_ = file;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_ != NULL) {
-#line 1934 "file.c"
-		GFile* _tmp2_ = NULL;
-		guint _tmp3_ = 0U;
+#line 1921 "file.c"
+		GFile* _tmp2_;
+		guint _tmp3_;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp2_ = file;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp3_ = g_file_hash (_tmp2_);
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = _tmp3_;
-#line 1943 "file.c"
+#line 1930 "file.c"
 	} else {
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = (guint) 0;
-#line 1947 "file.c"
+#line 1934 "file.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = _tmp0_;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1953 "file.c"
+#line 1940 "file.c"
 }