Merge tag 'upstream/0.26.1'

Upstream version 0.26.1

8 files changed, 291 insertions, 272 deletions

diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index 40ffa4d..1c584c3 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.34.4, the Vala compiler
+/* KeyValueMap.c generated by valac 0.34.7, the Vala compiler
  * generated from KeyValueMap.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -147,7 +147,7 @@ KeyValueMap* key_value_map_copy (KeyValueMap* self) {
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp2_ = self->priv->map;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
+		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 		_tmp4_ = _tmp3_;
 #line 17 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -253,7 +253,7 @@ GeeSet* key_value_map_get_keys (KeyValueMap* self) {
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp0_ = self->priv->map;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
+	_tmp1_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	_tmp2_ = _tmp1_;
 #line 28 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
@@ -1115,7 +1115,7 @@ static void key_value_map_instance_init (KeyValueMap * self) {
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self->priv = KEY_VALUE_MAP_GET_PRIVATE (self);
 #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
-	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 9 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
 	self->priv->map = _tmp0_;
 #line 7 "/home/jens/Source/shotwell/src/util/KeyValueMap.vala"
diff --git a/src/util/Util.c b/src/util/Util.c
index b7aff8f..65ba704 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.34.4, the Vala compiler
+/* Util.c generated by valac 0.34.7, the Vala compiler
  * generated from Util.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/file.c b/src/util/file.c
index 211fbe3..3f4b228 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.34.4, the Vala compiler
+/* file.c generated by valac 0.34.7, the Vala compiler
  * generated from file.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -54,10 +54,11 @@ static gpointer _g_error_copy0 (gpointer self) {
 
 gboolean claim_file (GFile* file, GError** error) {
 	gboolean result = FALSE;
+	gboolean _tmp11_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 12 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 61 "file.c"
+#line 62 "file.c"
 	{
 		GFile* _tmp0_ = NULL;
 		GFileOutputStream* _tmp1_ = NULL;
@@ -72,14 +73,14 @@ gboolean claim_file (GFile* file, GError** error) {
 		_g_object_unref0 (_tmp2_);
 #line 14 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 76 "file.c"
+#line 77 "file.c"
 			goto __catch0_g_error;
 		}
 #line 17 "/home/jens/Source/shotwell/src/util/file.vala"
 		result = TRUE;
 #line 17 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 83 "file.c"
+#line 84 "file.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
@@ -94,7 +95,7 @@ gboolean claim_file (GFile* file, GError** error) {
 		_tmp3_ = err;
 #line 20 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (!g_error_matches (_tmp3_, G_IO_ERROR, G_IO_ERROR_EXISTS)) {
-#line 98 "file.c"
+#line 99 "file.c"
 			GFile* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
 			gchar* _tmp6_ = NULL;
@@ -124,7 +125,7 @@ gboolean claim_file (GFile* file, GError** error) {
 			_inner_error_ = _tmp10_;
 #line 23 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_error_free0 (err);
-#line 128 "file.c"
+#line 129 "file.c"
 			goto __finally0;
 		}
 #line 26 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -133,14 +134,14 @@ gboolean claim_file (GFile* file, GError** error) {
 		_g_error_free0 (err);
 #line 26 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 137 "file.c"
+#line 138 "file.c"
 	}
 	__finally0:
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_propagate_error (error, _inner_error_);
 #line 13 "/home/jens/Source/shotwell/src/util/file.vala"
-	return FALSE;
-#line 144 "file.c"
+	return _tmp11_;
+#line 145 "file.c"
 }
 
 
@@ -190,7 +191,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 		_g_object_unref0 (file);
 #line 39 "/home/jens/Source/shotwell/src/util/file.vala"
 		return NULL;
-#line 194 "file.c"
+#line 195 "file.c"
 	}
 #line 39 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp3_) {
@@ -202,11 +203,11 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 		if (collision) {
 #line 42 "/home/jens/Source/shotwell/src/util/file.vala"
 			*collision = _vala_collision;
-#line 206 "file.c"
+#line 207 "file.c"
 		}
 #line 42 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 210 "file.c"
+#line 211 "file.c"
 	}
 #line 46 "/home/jens/Source/shotwell/src/util/file.vala"
 	_vala_collision = TRUE;
@@ -222,19 +223,19 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 	_g_free0 (ext);
 #line 49 "/home/jens/Source/shotwell/src/util/file.vala"
 	ext = _tmp8_;
-#line 226 "file.c"
+#line 227 "file.c"
 	{
 		gint ctr = 0;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 		ctr = 1;
-#line 231 "file.c"
+#line 232 "file.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp9_ = TRUE;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 			while (TRUE) {
-#line 238 "file.c"
+#line 239 "file.c"
 				gint _tmp11_ = 0;
 				gchar* _tmp12_ = NULL;
 				const gchar* _tmp13_ = NULL;
@@ -248,13 +249,13 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 				gboolean _tmp27_ = FALSE;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (!_tmp9_) {
-#line 252 "file.c"
+#line 253 "file.c"
 					gint _tmp10_ = 0;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp10_ = ctr;
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					ctr = _tmp10_ + 1;
-#line 258 "file.c"
+#line 259 "file.c"
 				}
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp9_ = FALSE;
@@ -264,13 +265,13 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 				if (!(_tmp11_ < G_MAXINT)) {
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 					break;
-#line 268 "file.c"
+#line 269 "file.c"
 				}
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp13_ = ext;
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (_tmp13_ != NULL) {
-#line 274 "file.c"
+#line 275 "file.c"
 					const gchar* _tmp14_ = NULL;
 					gint _tmp15_ = 0;
 					const gchar* _tmp16_ = NULL;
@@ -287,7 +288,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_g_free0 (_tmp12_);
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp12_ = _tmp17_;
-#line 291 "file.c"
+#line 292 "file.c"
 				} else {
 					const gchar* _tmp18_ = NULL;
 					gint _tmp19_ = 0;
@@ -302,7 +303,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_g_free0 (_tmp12_);
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 					_tmp12_ = _tmp20_;
-#line 306 "file.c"
+#line 307 "file.c"
 				}
 #line 53 "/home/jens/Source/shotwell/src/util/file.vala"
 				_tmp21_ = g_strdup (_tmp12_);
@@ -340,7 +341,7 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					_g_object_unref0 (file);
 #line 56 "/home/jens/Source/shotwell/src/util/file.vala"
 					return NULL;
-#line 344 "file.c"
+#line 345 "file.c"
 				}
 #line 56 "/home/jens/Source/shotwell/src/util/file.vala"
 				if (_tmp25_) {
@@ -358,17 +359,17 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 					if (collision) {
 #line 57 "/home/jens/Source/shotwell/src/util/file.vala"
 						*collision = _vala_collision;
-#line 362 "file.c"
+#line 363 "file.c"
 					}
 #line 57 "/home/jens/Source/shotwell/src/util/file.vala"
 					return result;
-#line 366 "file.c"
+#line 367 "file.c"
 				}
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				_g_free0 (new_name);
 #line 52 "/home/jens/Source/shotwell/src/util/file.vala"
 				_g_free0 (_tmp12_);
-#line 372 "file.c"
+#line 373 "file.c"
 			}
 		}
 	}
@@ -396,11 +397,11 @@ GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collis
 	if (collision) {
 #line 62 "/home/jens/Source/shotwell/src/util/file.vala"
 		*collision = _vala_collision;
-#line 400 "file.c"
+#line 401 "file.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 404 "file.c"
+#line 405 "file.c"
 }
 
 
@@ -423,7 +424,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 427 "file.c"
+#line 428 "file.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -431,7 +432,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 435 "file.c"
+#line 436 "file.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -443,7 +444,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 447 "file.c"
+#line 448 "file.c"
 	}
 }
 
@@ -467,21 +468,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 471 "file.c"
+#line 472 "file.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 477 "file.c"
+#line 478 "file.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 481 "file.c"
+#line 482 "file.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 485 "file.c"
+#line 486 "file.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -493,7 +494,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 497 "file.c"
+#line 498 "file.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -503,13 +504,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 507 "file.c"
+#line 508 "file.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 513 "file.c"
+#line 514 "file.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -523,7 +524,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 527 "file.c"
+#line 528 "file.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -533,13 +534,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 537 "file.c"
+#line 538 "file.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 543 "file.c"
+#line 544 "file.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -548,7 +549,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 552 "file.c"
+#line 553 "file.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -568,7 +569,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 572 "file.c"
+#line 573 "file.c"
 }
 
 
@@ -591,7 +592,7 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 	_tmp2_ = offset;
 #line 67 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ <= ((glong) 0)) {
-#line 595 "file.c"
+#line 596 "file.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -606,7 +607,7 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 		_g_free0 (_vala_ext);
 #line 69 "/home/jens/Source/shotwell/src/util/file.vala"
 		_vala_ext = NULL;
-#line 610 "file.c"
+#line 611 "file.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		glong _tmp6_ = 0L;
@@ -634,27 +635,27 @@ void disassemble_filename (const gchar* basename, gchar** name, gchar** ext) {
 		_g_free0 (_vala_ext);
 #line 72 "/home/jens/Source/shotwell/src/util/file.vala"
 		_vala_ext = _tmp10_;
-#line 638 "file.c"
+#line 639 "file.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (name) {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		*name = _vala_name;
-#line 644 "file.c"
+#line 645 "file.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_free0 (_vala_name);
-#line 648 "file.c"
+#line 649 "file.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (ext) {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		*ext = _vala_ext;
-#line 654 "file.c"
+#line 655 "file.c"
 	} else {
 #line 65 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_free0 (_vala_ext);
-#line 658 "file.c"
+#line 659 "file.c"
 	}
 }
 
@@ -683,13 +684,13 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	_tmp2_ = type;
 #line 79 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ == G_FILE_TYPE_REGULAR) {
-#line 687 "file.c"
+#line 688 "file.c"
 		GFileInfo* info = NULL;
-		GFileInfo* _tmp16_ = NULL;
-		gint64 _tmp17_ = 0LL;
+		GFileInfo* _tmp17_ = NULL;
+		gint64 _tmp18_ = 0LL;
 #line 80 "/home/jens/Source/shotwell/src/util/file.vala"
 		info = NULL;
-#line 693 "file.c"
+#line 694 "file.c"
 		{
 			GFileInfo* _tmp3_ = NULL;
 			GFile* _tmp4_ = NULL;
@@ -706,7 +707,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_tmp3_ = _tmp6_;
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 710 "file.c"
+#line 711 "file.c"
 				goto __catch1_g_error;
 			}
 #line 82 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -719,7 +720,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			info = _tmp7_;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (_tmp3_);
-#line 723 "file.c"
+#line 724 "file.c"
 		}
 		goto __finally1;
 		__catch1_g_error:
@@ -739,7 +740,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_tmp8_ = err;
 #line 85 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (g_error_matches (_tmp8_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-#line 743 "file.c"
+#line 744 "file.c"
 				GError* _tmp9_ = NULL;
 				GError* _tmp10_ = NULL;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -750,7 +751,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 				_inner_error_ = _tmp10_;
 #line 86 "/home/jens/Source/shotwell/src/util/file.vala"
 				_g_error_free0 (err);
-#line 754 "file.c"
+#line 755 "file.c"
 				goto __finally1;
 			}
 #line 88 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -775,118 +776,120 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_g_object_unref0 (info);
 #line 90 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 779 "file.c"
+#line 780 "file.c"
 		}
 		__finally1:
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 785 "file.c"
+			guint64 _tmp16_ = 0ULL;
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (info);
 #line 81 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 790 "file.c"
+			return _tmp16_;
+#line 793 "file.c"
 		}
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp16_ = info;
+		_tmp17_ = info;
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp17_ = g_file_info_get_size (_tmp16_);
+		_tmp18_ = g_file_info_get_size (_tmp17_);
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
-		result = (guint64) _tmp17_;
+		result = (guint64) _tmp18_;
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (info);
 #line 93 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 802 "file.c"
+#line 805 "file.c"
 	} else {
-		GFileType _tmp18_ = 0;
+		GFileType _tmp19_ = 0;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp18_ = type;
+		_tmp19_ = type;
 #line 94 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (_tmp18_ != G_FILE_TYPE_DIRECTORY) {
+		if (_tmp19_ != G_FILE_TYPE_DIRECTORY) {
 #line 95 "/home/jens/Source/shotwell/src/util/file.vala"
 			result = (guint64) 0;
 #line 95 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 813 "file.c"
+#line 816 "file.c"
 		}
 	}
 	{
-		GFileEnumerator* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		GCancellable* _tmp21_ = NULL;
-		GFileEnumerator* _tmp22_ = NULL;
+		GFileEnumerator* _tmp20_ = NULL;
+		GFile* _tmp21_ = NULL;
+		GCancellable* _tmp22_ = NULL;
 		GFileEnumerator* _tmp23_ = NULL;
 		GFileEnumerator* _tmp24_ = NULL;
+		GFileEnumerator* _tmp25_ = NULL;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp20_ = file_or_dir;
+		_tmp21_ = file_or_dir;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp21_ = cancellable;
+		_tmp22_ = cancellable;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp22_ = g_file_enumerate_children (_tmp20_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, _tmp21_, &_inner_error_);
+		_tmp23_ = g_file_enumerate_children (_tmp21_, G_FILE_ATTRIBUTE_STANDARD_NAME, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, _tmp22_, &_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp19_ = _tmp22_;
+		_tmp20_ = _tmp23_;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 833 "file.c"
+#line 836 "file.c"
 			goto __catch2_g_error;
 		}
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp23_ = _tmp19_;
+		_tmp24_ = _tmp20_;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp19_ = NULL;
+		_tmp20_ = NULL;
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (enumerator);
 #line 100 "/home/jens/Source/shotwell/src/util/file.vala"
-		enumerator = _tmp23_;
+		enumerator = _tmp24_;
 #line 102 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp24_ = enumerator;
+		_tmp25_ = enumerator;
 #line 102 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (_tmp24_ == NULL) {
+		if (_tmp25_ == NULL) {
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
 			result = (guint64) 0;
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp19_);
+			_g_object_unref0 (_tmp20_);
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 103 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 856 "file.c"
+#line 859 "file.c"
 		}
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp19_);
-#line 860 "file.c"
+		_g_object_unref0 (_tmp20_);
+#line 863 "file.c"
 	}
 	goto __finally2;
 	__catch2_g_error:
 	{
 		GError* err = NULL;
-		gboolean _tmp25_ = FALSE;
-		GError* _tmp26_ = NULL;
-		GError* _tmp28_ = NULL;
+		gboolean _tmp26_ = FALSE;
+		GError* _tmp27_ = NULL;
 		GError* _tmp29_ = NULL;
+		GError* _tmp30_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		err = _inner_error_;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		_inner_error_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp26_ = err;
+		_tmp27_ = err;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (g_error_matches (_tmp26_, G_FILE_ERROR, G_FILE_ERROR_PERM)) {
+		if (g_error_matches (_tmp27_, G_FILE_ERROR, G_FILE_ERROR_PERM)) {
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-			_tmp25_ = TRUE;
-#line 880 "file.c"
+			_tmp26_ = TRUE;
+#line 883 "file.c"
 		} else {
-			GError* _tmp27_ = NULL;
+			GError* _tmp28_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-			_tmp27_ = err;
+			_tmp28_ = err;
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-			_tmp25_ = g_error_matches (_tmp27_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED);
-#line 887 "file.c"
+			_tmp26_ = g_error_matches (_tmp28_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED);
+#line 890 "file.c"
 		}
 #line 106 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (_tmp25_) {
+		if (_tmp26_) {
 #line 107 "/home/jens/Source/shotwell/src/util/file.vala"
 			result = (guint64) 0;
 #line 107 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -895,29 +898,31 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 			_g_object_unref0 (enumerator);
 #line 107 "/home/jens/Source/shotwell/src/util/file.vala"
 			return result;
-#line 899 "file.c"
+#line 902 "file.c"
 		}
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp28_ = err;
+		_tmp29_ = err;
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp29_ = _g_error_copy0 (_tmp28_);
+		_tmp30_ = _g_error_copy0 (_tmp29_);
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
-		_inner_error_ = _tmp29_;
+		_inner_error_ = _tmp30_;
 #line 109 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_error_free0 (err);
-#line 909 "file.c"
+#line 912 "file.c"
 		goto __finally2;
 	}
 	__finally2:
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 918 "file.c"
+		guint64 _tmp31_ = 0ULL;
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (enumerator);
 #line 99 "/home/jens/Source/shotwell/src/util/file.vala"
-		return 0ULL;
-#line 921 "file.c"
+		return _tmp31_;
+#line 926 "file.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/util/file.vala"
 	total_bytes = (guint64) 0;
@@ -925,33 +930,35 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	info = NULL;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 929 "file.c"
-		GFileInfo* _tmp30_ = NULL;
-		GFileEnumerator* _tmp31_ = NULL;
-		GCancellable* _tmp32_ = NULL;
-		GFileInfo* _tmp33_ = NULL;
-		GFileInfo* _tmp34_ = NULL;
+#line 934 "file.c"
+		GFileInfo* _tmp32_ = NULL;
+		GFileEnumerator* _tmp33_ = NULL;
+		GCancellable* _tmp34_ = NULL;
 		GFileInfo* _tmp35_ = NULL;
-		guint64 _tmp36_ = 0ULL;
-		GFile* _tmp37_ = NULL;
+		GFileInfo* _tmp37_ = NULL;
 		GFileInfo* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
+		guint64 _tmp39_ = 0ULL;
 		GFile* _tmp40_ = NULL;
-		GFile* _tmp41_ = NULL;
-		GCancellable* _tmp42_ = NULL;
-		guint64 _tmp43_ = 0ULL;
-		guint64 _tmp44_ = 0ULL;
-		guint64 _tmp45_ = 0ULL;
+		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;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp31_ = enumerator;
+		_tmp33_ = enumerator;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp32_ = cancellable;
+		_tmp34_ = cancellable;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp33_ = g_file_enumerator_next_file (_tmp31_, _tmp32_, &_inner_error_);
+		_tmp35_ = g_file_enumerator_next_file (_tmp33_, _tmp34_, &_inner_error_);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp30_ = _tmp33_;
+		_tmp32_ = _tmp35_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 961 "file.c"
+			guint64 _tmp36_ = 0ULL;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -959,68 +966,70 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 964 "file.c"
+			return _tmp36_;
+#line 971 "file.c"
 		}
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp34_ = _tmp30_;
+		_tmp37_ = _tmp32_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp30_ = NULL;
+		_tmp32_ = NULL;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (info);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		info = _tmp34_;
+		info = _tmp37_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp35_ = info;
+		_tmp38_ = info;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (!(_tmp35_ != NULL)) {
+		if (!(_tmp38_ != NULL)) {
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp30_);
+			_g_object_unref0 (_tmp32_);
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 982 "file.c"
+#line 989 "file.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp37_ = file_or_dir;
+		_tmp40_ = file_or_dir;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp38_ = info;
+		_tmp41_ = info;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp39_ = g_file_info_get_name (_tmp38_);
+		_tmp42_ = g_file_info_get_name (_tmp41_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp40_ = g_file_get_child (_tmp37_, _tmp39_);
+		_tmp43_ = g_file_get_child (_tmp40_, _tmp42_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp41_ = _tmp40_;
+		_tmp44_ = _tmp43_;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp42_ = cancellable;
+		_tmp45_ = cancellable;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp43_ = query_total_file_size (_tmp41_, _tmp42_, &_inner_error_);
+		_tmp46_ = query_total_file_size (_tmp44_, _tmp45_, &_inner_error_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp44_ = _tmp43_;
+		_tmp47_ = _tmp46_;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp41_);
+		_g_object_unref0 (_tmp44_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp36_ = _tmp44_;
+		_tmp39_ = _tmp47_;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1013 "file.c"
+			guint64 _tmp48_ = 0ULL;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp30_);
+			_g_object_unref0 (_tmp32_);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (info);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 1016 "file.c"
+			return _tmp48_;
+#line 1025 "file.c"
 		}
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp45_ = total_bytes;
+		_tmp49_ = total_bytes;
 #line 116 "/home/jens/Source/shotwell/src/util/file.vala"
-		total_bytes = _tmp45_ + _tmp36_;
+		total_bytes = _tmp49_ + _tmp39_;
 #line 115 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp30_);
-#line 1024 "file.c"
+		_g_object_unref0 (_tmp32_);
+#line 1033 "file.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = total_bytes;
@@ -1030,7 +1039,7 @@ guint64 query_total_file_size (GFile* file_or_dir, GCancellable* cancellable, GE
 	_g_object_unref0 (enumerator);
 #line 118 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1034 "file.c"
+#line 1043 "file.c"
 }
 
 
@@ -1062,7 +1071,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 	_tmp2_ = type;
 #line 128 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != G_FILE_TYPE_DIRECTORY) {
-#line 1066 "file.c"
+#line 1075 "file.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1094,7 +1103,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		g_propagate_error (error, _inner_error_);
 #line 129 "/home/jens/Source/shotwell/src/util/file.vala"
 		return;
-#line 1098 "file.c"
+#line 1107 "file.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp10_ = dir;
@@ -1110,7 +1119,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		g_propagate_error (error, _inner_error_);
 #line 131 "/home/jens/Source/shotwell/src/util/file.vala"
 		return;
-#line 1114 "file.c"
+#line 1123 "file.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/util/file.vala"
 	info = NULL;
@@ -1118,7 +1127,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 	i = (guint64) 0;
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 	while (TRUE) {
-#line 1122 "file.c"
+#line 1131 "file.c"
 		GFileInfo* _tmp13_ = NULL;
 		GFileEnumerator* _tmp14_ = NULL;
 		GCancellable* _tmp15_ = NULL;
@@ -1155,7 +1164,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (enumerator);
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 			return;
-#line 1159 "file.c"
+#line 1168 "file.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp17_ = _tmp13_;
@@ -1173,7 +1182,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (_tmp13_);
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1177 "file.c"
+#line 1186 "file.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp19_ = info;
@@ -1185,13 +1194,13 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (_tmp13_);
 #line 137 "/home/jens/Source/shotwell/src/util/file.vala"
 			continue;
-#line 1189 "file.c"
+#line 1198 "file.c"
 		}
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp22_ = exceptions;
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp22_ != NULL) {
-#line 1195 "file.c"
+#line 1204 "file.c"
 			GeeSet* _tmp23_ = NULL;
 			GFileInfo* _tmp24_ = NULL;
 			const gchar* _tmp25_ = NULL;
@@ -1206,11 +1215,11 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp21_ = _tmp26_;
-#line 1210 "file.c"
+#line 1219 "file.c"
 		} else {
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp21_ = FALSE;
-#line 1214 "file.c"
+#line 1223 "file.c"
 		}
 #line 139 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp21_) {
@@ -1218,7 +1227,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (_tmp13_);
 #line 140 "/home/jens/Source/shotwell/src/util/file.vala"
 			continue;
-#line 1222 "file.c"
+#line 1231 "file.c"
 		}
 #line 142 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp27_ = dir;
@@ -1230,7 +1239,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		_tmp30_ = g_file_get_child (_tmp27_, _tmp29_);
 #line 142 "/home/jens/Source/shotwell/src/util/file.vala"
 		file = _tmp30_;
-#line 1234 "file.c"
+#line 1243 "file.c"
 		{
 			GFile* _tmp31_ = NULL;
 			GCancellable* _tmp32_ = NULL;
@@ -1242,7 +1251,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			g_file_delete (_tmp31_, _tmp32_, &_inner_error_);
 #line 144 "/home/jens/Source/shotwell/src/util/file.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1246 "file.c"
+#line 1255 "file.c"
 				goto __catch3_g_error;
 			}
 		}
@@ -1275,7 +1284,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_free0 (_tmp35_);
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_error_free0 (err);
-#line 1279 "file.c"
+#line 1288 "file.c"
 		}
 		__finally3:
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1292,7 +1301,7 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_g_object_unref0 (enumerator);
 #line 143 "/home/jens/Source/shotwell/src/util/file.vala"
 			return;
-#line 1296 "file.c"
+#line 1305 "file.c"
 		}
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp39_ = monitor;
@@ -1300,21 +1309,21 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 		_tmp39__target = monitor_target;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp39_ != NULL) {
-#line 1304 "file.c"
+#line 1313 "file.c"
 			guint64 _tmp40_ = 0ULL;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp40_ = file_count;
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp38_ = _tmp40_ > ((guint64) 0);
-#line 1310 "file.c"
+#line 1319 "file.c"
 		} else {
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp38_ = FALSE;
-#line 1314 "file.c"
+#line 1323 "file.c"
 		}
 #line 149 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (_tmp38_) {
-#line 1318 "file.c"
+#line 1327 "file.c"
 			ProgressMonitor _tmp41_ = NULL;
 			void* _tmp41__target = NULL;
 			guint64 _tmp42_ = 0ULL;
@@ -1334,19 +1343,19 @@ void delete_all_files (GFile* dir, GeeSet* exceptions, ProgressMonitor monitor,
 			_tmp44_ = i;
 #line 150 "/home/jens/Source/shotwell/src/util/file.vala"
 			_tmp41_ (_tmp42_, _tmp44_, TRUE, _tmp41__target);
-#line 1338 "file.c"
+#line 1347 "file.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (file);
 #line 135 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1344 "file.c"
+#line 1353 "file.c"
 	}
 #line 125 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (info);
 #line 125 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (enumerator);
-#line 1350 "file.c"
+#line 1359 "file.c"
 }
 
 
@@ -1355,8 +1364,8 @@ time_t query_file_modified (GFile* file, GError** error) {
 	GFileInfo* info = NULL;
 	GFile* _tmp0_ = NULL;
 	GFileInfo* _tmp1_ = NULL;
-	GTimeVal _tmp2_ = {0};
-	glong _tmp3_ = 0L;
+	GTimeVal _tmp3_ = {0};
+	glong _tmp4_ = 0L;
 	GError * _inner_error_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (file), 0);
@@ -1368,23 +1377,25 @@ time_t query_file_modified (GFile* file, GError** error) {
 	info = _tmp1_;
 #line 155 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1381 "file.c"
+		time_t _tmp2_ = 0;
 #line 155 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #line 155 "/home/jens/Source/shotwell/src/util/file.vala"
-		return 0;
-#line 1376 "file.c"
+		return _tmp2_;
+#line 1387 "file.c"
 	}
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
-	g_file_info_get_modification_time (info, &_tmp2_);
+	g_file_info_get_modification_time (info, &_tmp3_);
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp3_ = _tmp2_.tv_sec;
+	_tmp4_ = _tmp3_.tv_sec;
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
-	result = (time_t) _tmp3_;
+	result = (time_t) _tmp4_;
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
 	_g_object_unref0 (info);
 #line 158 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1388 "file.c"
+#line 1399 "file.c"
 }
 
 
@@ -1402,7 +1413,7 @@ gboolean query_is_directory (GFile* file) {
 	result = _tmp1_ == G_FILE_TYPE_DIRECTORY;
 #line 162 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1406 "file.c"
+#line 1417 "file.c"
 }
 
 
@@ -1413,13 +1424,13 @@ gboolean query_is_directory_empty (GFile* dir, GError** error) {
 	GFileEnumerator* enumerator = NULL;
 	GFile* _tmp2_ = NULL;
 	GFileEnumerator* _tmp3_ = NULL;
-	GFileEnumerator* _tmp4_ = NULL;
-	GFileInfo* _tmp5_ = NULL;
-	GFileEnumerator* _tmp6_ = NULL;
-	GFileInfo* _tmp7_ = NULL;
+	GFileEnumerator* _tmp5_ = NULL;
+	GFileInfo* _tmp6_ = NULL;
+	GFileEnumerator* _tmp7_ = NULL;
 	GFileInfo* _tmp8_ = NULL;
-	GFileInfo* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
+	GFileInfo* _tmp10_ = NULL;
+	GFileInfo* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/util/file.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), FALSE);
@@ -1433,7 +1444,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 1437 "file.c"
+#line 1448 "file.c"
 	}
 #line 169 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp2_ = dir;
@@ -1443,59 +1454,63 @@ 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"
+		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 FALSE;
-#line 1451 "file.c"
+		return _tmp4_;
+#line 1464 "file.c"
 	}
 #line 171 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp4_ = enumerator;
+	_tmp5_ = enumerator;
 #line 171 "/home/jens/Source/shotwell/src/util/file.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp5_ == NULL) {
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		result = FALSE;
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (enumerator);
 #line 172 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1463 "file.c"
+#line 1476 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp6_ = enumerator;
+	_tmp7_ = enumerator;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_);
+	_tmp8_ = g_file_enumerator_next_file (_tmp7_, NULL, &_inner_error_);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp5_ = _tmp7_;
+	_tmp6_ = _tmp8_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1486 "file.c"
+		gboolean _tmp9_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
 		g_propagate_error (error, _inner_error_);
 #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 FALSE;
-#line 1479 "file.c"
+		return _tmp9_;
+#line 1494 "file.c"
 	}
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp8_ = _tmp5_;
+	_tmp10_ = _tmp6_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp5_ = NULL;
+	_tmp6_ = NULL;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp9_ = _tmp8_;
+	_tmp11_ = _tmp10_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_tmp10_ = _tmp9_ == NULL;
+	_tmp12_ = _tmp11_ == NULL;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp11_);
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	result = _tmp10_;
+	result = _tmp12_;
 #line 174 "/home/jens/Source/shotwell/src/util/file.vala"
-	_g_object_unref0 (_tmp5_);
+	_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 1499 "file.c"
+#line 1514 "file.c"
 }
 
 
@@ -1532,7 +1547,7 @@ 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 1536 "file.c"
+#line 1551 "file.c"
 		gchar* _tmp6_ = NULL;
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp6_ = g_strdup ("~");
@@ -1544,7 +1559,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 183 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1548 "file.c"
+#line 1563 "file.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp7_ = path;
@@ -1554,7 +1569,7 @@ 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 1558 "file.c"
+#line 1573 "file.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
@@ -1589,7 +1604,7 @@ gchar* get_display_pathname (GFile* file) {
 		_g_free0 (path);
 #line 186 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1593 "file.c"
+#line 1608 "file.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = path;
@@ -1597,7 +1612,7 @@ gchar* get_display_pathname (GFile* file) {
 	_g_free0 (home);
 #line 188 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1601 "file.c"
+#line 1616 "file.c"
 }
 
 
@@ -1619,7 +1634,7 @@ 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 1623 "file.c"
+#line 1638 "file.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1630,7 +1645,7 @@ gchar* strip_pretty_path (const gchar* path) {
 		result = _tmp3_;
 #line 193 "/home/jens/Source/shotwell/src/util/file.vala"
 		return result;
-#line 1634 "file.c"
+#line 1649 "file.c"
 	}
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	_tmp4_ = g_get_home_dir ();
@@ -1650,7 +1665,7 @@ gchar* strip_pretty_path (const gchar* path) {
 	result = _tmp9_;
 #line 195 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1654 "file.c"
+#line 1669 "file.c"
 }
 
 
@@ -1671,7 +1686,7 @@ gchar* get_file_info_id (GFileInfo* info) {
 	result = _tmp2_;
 #line 199 "/home/jens/Source/shotwell/src/util/file.vala"
 	return result;
-#line 1675 "file.c"
+#line 1690 "file.c"
 }
 
 
@@ -1681,7 +1696,7 @@ 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 1685 "file.c"
+#line 1700 "file.c"
 		guint64 _tmp0_ = 0ULL;
 		guint64 _tmp1_ = 0ULL;
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1690,13 +1705,13 @@ void skip_uint64 (GInputStream* input, guint64 skip_amount, GError** error) {
 		if (!(_tmp0_ > ((guint64) 0))) {
 #line 204 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1694 "file.c"
+#line 1709 "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 1700 "file.c"
+#line 1715 "file.c"
 			GInputStream* _tmp2_ = NULL;
 			guint64 _tmp3_ = 0ULL;
 #line 207 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1709,13 +1724,13 @@ 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 1713 "file.c"
+#line 1728 "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 1719 "file.c"
+#line 1734 "file.c"
 		} else {
 			GInputStream* _tmp4_ = NULL;
 			guint64 _tmp5_ = 0ULL;
@@ -1731,11 +1746,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 1735 "file.c"
+#line 1750 "file.c"
 			}
 #line 211 "/home/jens/Source/shotwell/src/util/file.vala"
 			skip_amount = (guint64) 0;
-#line 1739 "file.c"
+#line 1754 "file.c"
 		}
 	}
 }
@@ -1763,7 +1778,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 1767 "file.c"
+#line 1782 "file.c"
 	}
 #line 221 "/home/jens/Source/shotwell/src/util/file.vala"
 	count = (guint64) 0;
@@ -1775,31 +1790,35 @@ 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"
+		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 0ULL;
-#line 1783 "file.c"
+		return _tmp4_;
+#line 1800 "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 1789 "file.c"
-		GFileInfo* _tmp4_ = NULL;
-		GFileEnumerator* _tmp5_ = NULL;
-		GFileInfo* _tmp6_ = NULL;
+#line 1806 "file.c"
+		GFileInfo* _tmp5_ = NULL;
+		GFileEnumerator* _tmp6_ = NULL;
 		GFileInfo* _tmp7_ = NULL;
-		GFileInfo* _tmp8_ = NULL;
-		guint64 _tmp9_ = 0ULL;
+		GFileInfo* _tmp9_ = NULL;
+		GFileInfo* _tmp10_ = NULL;
+		guint64 _tmp11_ = 0ULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp5_ = enumerator;
+		_tmp6_ = enumerator;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp6_ = g_file_enumerator_next_file (_tmp5_, NULL, &_inner_error_);
+		_tmp7_ = g_file_enumerator_next_file (_tmp6_, NULL, &_inner_error_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp4_ = _tmp6_;
+		_tmp5_ = _tmp7_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1821 "file.c"
+			guint64 _tmp8_ = 0ULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			g_propagate_error (error, _inner_error_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1807,34 +1826,34 @@ guint64 count_files_in_directory (GFile* dir, GError** error) {
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			_g_object_unref0 (enumerator);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-			return 0ULL;
-#line 1812 "file.c"
+			return _tmp8_;
+#line 1831 "file.c"
 		}
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp7_ = _tmp4_;
+		_tmp9_ = _tmp5_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp4_ = NULL;
+		_tmp5_ = NULL;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 		_g_object_unref0 (info);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		info = _tmp7_;
+		info = _tmp9_;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp8_ = info;
+		_tmp10_ = info;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		if (!(_tmp8_ != NULL)) {
+		if (!(_tmp10_ != NULL)) {
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-			_g_object_unref0 (_tmp4_);
+			_g_object_unref0 (_tmp5_);
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
 			break;
-#line 1830 "file.c"
+#line 1849 "file.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/util/file.vala"
-		_tmp9_ = count;
+		_tmp11_ = count;
 #line 227 "/home/jens/Source/shotwell/src/util/file.vala"
-		count = _tmp9_ + 1;
+		count = _tmp11_ + 1;
 #line 226 "/home/jens/Source/shotwell/src/util/file.vala"
-		_g_object_unref0 (_tmp4_);
-#line 1838 "file.c"
+		_g_object_unref0 (_tmp5_);
+#line 1857 "file.c"
 	}
 #line 229 "/home/jens/Source/shotwell/src/util/file.vala"
 	result = count;
@@ -1844,7 +1863,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 1848 "file.c"
+#line 1867 "file.c"
 }
 
 
@@ -1861,21 +1880,21 @@ gboolean file_equal (GFile* a, GFile* b) {
 	_tmp2_ = a;
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp2_ != NULL) {
-#line 1865 "file.c"
+#line 1884 "file.c"
 		GFile* _tmp3_ = NULL;
 #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 1871 "file.c"
+#line 1890 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp1_ = FALSE;
-#line 1875 "file.c"
+#line 1894 "file.c"
 	}
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_) {
-#line 1879 "file.c"
+#line 1898 "file.c"
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -1887,17 +1906,17 @@ 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 1891 "file.c"
+#line 1910 "file.c"
 	} else {
 #line 234 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = FALSE;
-#line 1895 "file.c"
+#line 1914 "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 1901 "file.c"
+#line 1920 "file.c"
 }
 
 
@@ -1911,7 +1930,7 @@ guint file_hash (GFile* file) {
 	_tmp1_ = file;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 	if (_tmp1_ != NULL) {
-#line 1915 "file.c"
+#line 1934 "file.c"
 		GFile* _tmp2_ = NULL;
 		guint _tmp3_ = 0U;
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
@@ -1920,17 +1939,17 @@ guint file_hash (GFile* file) {
 		_tmp3_ = g_file_hash (_tmp2_);
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = _tmp3_;
-#line 1924 "file.c"
+#line 1943 "file.c"
 	} else {
 #line 239 "/home/jens/Source/shotwell/src/util/file.vala"
 		_tmp0_ = (guint) 0;
-#line 1928 "file.c"
+#line 1947 "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 1934 "file.c"
+#line 1953 "file.c"
 }
 
 
diff --git a/src/util/image.c b/src/util/image.c
index f6c82ec..1bc543b 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.34.4, the Vala compiler
+/* image.c generated by valac 0.34.7, the Vala compiler
  * generated from image.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/misc.c b/src/util/misc.c
index 65c37e5..69a38e7 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.4, the Vala compiler
+/* misc.c generated by valac 0.34.7, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1187,7 +1187,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 #line 1188 "misc.c"
 	}
 #line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 	intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet);
 #line 1194 "misc.c"
@@ -1602,7 +1602,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 #line 188 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_);
 #line 190 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp9_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, photo_id_free, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, (GDestroyNotify) photo_id_free, NULL, NULL, NULL);
 #line 190 "/home/jens/Source/shotwell/src/util/misc.vala"
 	list = _tmp9_;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1874,7 +1874,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 #line 216 "/home/jens/Source/shotwell/src/util/misc.vala"
 	memcpy (_tmp6_, _tmp7_, (gsize) _tmp8_);
 #line 218 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp9_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp9_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 218 "/home/jens/Source/shotwell/src/util/misc.vala"
 	list = _tmp9_;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
diff --git a/src/util/string.c b/src/util/string.c
index 931e58d..ee1a1bb 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.34.4, the Vala compiler
+/* string.c generated by valac 0.34.7, the Vala compiler
  * generated from string.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/system.c b/src/util/system.c
index d56348e..e7ff262 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.34.4, the Vala compiler
+/* system.c generated by valac 0.34.7, the Vala compiler
  * generated from system.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/ui.c b/src/util/ui.c
index 2cb3739..e881e93 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.34.4, the Vala compiler
+/* ui.c generated by valac 0.34.7, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.