New upstream version 0.25.2upstream/0.25.2

1 files changed, 248 insertions, 300 deletions

diff --git a/src/util/misc.c b/src/util/misc.c
index b1a0d40..848194e 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.2, the Vala compiler
+/* misc.c generated by valac 0.32.1, the Vala compiler
  * generated from misc.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -269,9 +269,6 @@ void op_timer_start (OpTimer* self);
 void op_timer_stop (OpTimer* self);
 gchar* op_timer_to_string (OpTimer* self);
 static void op_timer_finalize (OpTimer* obj);
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message);
-gboolean is_twentyfour_hr_time_system (void);
-gboolean is_string_empty (const gchar* s);
 
 
 guint int64_hash (gint64* n) {
@@ -285,32 +282,32 @@ guint int64_hash (gint64* n) {
 	u8 = (guint8*) _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/util/misc.vala"
 	hash = (guint) 0;
-#line 289 "misc.c"
+#line 286 "misc.c"
 	{
 		gint ctr = 0;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 		ctr = 0;
-#line 294 "misc.c"
+#line 291 "misc.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp1_ = TRUE;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 			while (TRUE) {
-#line 301 "misc.c"
+#line 298 "misc.c"
 				gint _tmp3_ = 0;
 				guint _tmp4_ = 0U;
 				guint _tmp5_ = 0U;
 				guint8* _tmp6_ = NULL;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (!_tmp1_) {
-#line 308 "misc.c"
+#line 305 "misc.c"
 					gint _tmp2_ = 0;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					_tmp2_ = ctr;
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					ctr = _tmp2_ + 1;
-#line 314 "misc.c"
+#line 311 "misc.c"
 				}
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp1_ = FALSE;
@@ -320,7 +317,7 @@ guint int64_hash (gint64* n) {
 				if (!(((gulong) _tmp3_) < (sizeof (gint64) / sizeof (guint8)))) {
 #line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
 					break;
-#line 324 "misc.c"
+#line 321 "misc.c"
 				}
 #line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp4_ = hash;
@@ -332,7 +329,7 @@ guint int64_hash (gint64* n) {
 				u8 = _tmp6_ + 1;
 #line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
 				hash = ((_tmp4_ << 4) ^ (_tmp5_ >> 28)) ^ (*_tmp6_);
-#line 336 "misc.c"
+#line 333 "misc.c"
 			}
 		}
 	}
@@ -340,7 +337,7 @@ guint int64_hash (gint64* n) {
 	result = hash;
 #line 15 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 344 "misc.c"
+#line 341 "misc.c"
 }
 
 
@@ -362,7 +359,7 @@ gboolean int64_equal (gint64* a, gint64* b) {
 	result = (*bia) == (*bib);
 #line 22 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 366 "misc.c"
+#line 363 "misc.c"
 }
 
 
@@ -386,7 +383,7 @@ gint int64_compare (gint64* a, gint64* b) {
 		result = -1;
 #line 28 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 390 "misc.c"
+#line 387 "misc.c"
 	} else {
 		gint64 _tmp3_ = 0LL;
 #line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -397,13 +394,13 @@ gint int64_compare (gint64* a, gint64* b) {
 			result = 1;
 #line 30 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 401 "misc.c"
+#line 398 "misc.c"
 		} else {
 #line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
 			result = 0;
 #line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 407 "misc.c"
+#line 404 "misc.c"
 		}
 	}
 }
@@ -435,7 +432,7 @@ gint uint64_compare (guint64* a, guint64* b) {
 		result = -1;
 #line 40 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 439 "misc.c"
+#line 436 "misc.c"
 	} else {
 		guint64 _tmp4_ = 0ULL;
 		guint64 _tmp5_ = 0ULL;
@@ -449,13 +446,13 @@ gint uint64_compare (guint64* a, guint64* b) {
 			result = 1;
 #line 42 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 453 "misc.c"
+#line 450 "misc.c"
 		} else {
 #line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
 			result = 0;
 #line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return result;
-#line 459 "misc.c"
+#line 456 "misc.c"
 		}
 	}
 }
@@ -477,7 +474,7 @@ gboolean bool_value_equals (GValue* a, GValue* b) {
 	result = g_value_get_boolean (&_tmp0_) == g_value_get_boolean (&_tmp1_);
 #line 50 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 481 "misc.c"
+#line 478 "misc.c"
 }
 
 
@@ -497,7 +494,7 @@ gboolean int_value_equals (GValue* a, GValue* b) {
 	result = g_value_get_int (&_tmp0_) == g_value_get_int (&_tmp1_);
 #line 54 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 501 "misc.c"
+#line 498 "misc.c"
 }
 
 
@@ -521,7 +518,7 @@ gulong timeval_to_ms (GTimeVal* time_val) {
 	result = (((gulong) _tmp1_) * 1000) + (((gulong) _tmp3_) / 1000);
 #line 58 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 525 "misc.c"
+#line 522 "misc.c"
 }
 
 
@@ -537,7 +534,7 @@ gulong now_ms (void) {
 	result = _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 541 "misc.c"
+#line 538 "misc.c"
 }
 
 
@@ -556,7 +553,7 @@ gulong now_sec (void) {
 	result = (gulong) _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 560 "misc.c"
+#line 557 "misc.c"
 }
 
 
@@ -569,7 +566,7 @@ inline time_t now_time_t (void) {
 	result = (time_t) _tmp0_;
 #line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 573 "misc.c"
+#line 570 "misc.c"
 }
 
 
@@ -606,7 +603,7 @@ gchar* md5_binary (guint8* buffer, gsize length) {
 	_g_checksum_free0 (md5);
 #line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 610 "misc.c"
+#line 607 "misc.c"
 }
 
 
@@ -655,7 +652,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_g_checksum_free0 (md5);
 #line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return NULL;
-#line 659 "misc.c"
+#line 656 "misc.c"
 	}
 	{
 		gboolean _tmp4_ = FALSE;
@@ -663,7 +660,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_tmp4_ = TRUE;
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 667 "misc.c"
+#line 664 "misc.c"
 			gsize bytes_read = 0UL;
 			GFileInputStream* _tmp5_ = NULL;
 			guint8* _tmp6_ = NULL;
@@ -676,7 +673,7 @@ gchar* md5_file (GFile* file, GError** error) {
 			gsize _tmp11_ = 0UL;
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (!_tmp4_) {
-#line 680 "misc.c"
+#line 677 "misc.c"
 			}
 #line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = FALSE;
@@ -687,7 +684,7 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp6__length1 = buffer_length1;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
-			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
+			_tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 			bytes_read = (gsize) _tmp7_;
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -702,7 +699,7 @@ gchar* md5_file (GFile* file, GError** error) {
 				_g_checksum_free0 (md5);
 #line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
 				return NULL;
-#line 706 "misc.c"
+#line 703 "misc.c"
 			}
 #line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = bytes_read;
@@ -710,7 +707,7 @@ gchar* md5_file (GFile* file, GError** error) {
 			if (_tmp8_ <= ((gsize) 0)) {
 #line 92 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 714 "misc.c"
+#line 711 "misc.c"
 			}
 #line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = md5;
@@ -722,7 +719,7 @@ gchar* md5_file (GFile* file, GError** error) {
 			_tmp11_ = bytes_read;
 #line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
 			g_checksum_update (_tmp9_, (guchar*) _tmp10_, _tmp11_);
-#line 726 "misc.c"
+#line 723 "misc.c"
 		}
 	}
 	{
@@ -730,10 +727,10 @@ gchar* md5_file (GFile* file, GError** error) {
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp12_ = fins;
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
-		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+		g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
 #line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 737 "misc.c"
+#line 734 "misc.c"
 			goto __catch5_g_error;
 		}
 	}
@@ -766,7 +763,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_g_free0 (_tmp15_);
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_error_free0 (err);
-#line 770 "misc.c"
+#line 767 "misc.c"
 	}
 	__finally5:
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -781,7 +778,7 @@ gchar* md5_file (GFile* file, GError** error) {
 		_g_checksum_free0 (md5);
 #line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return NULL;
-#line 785 "misc.c"
+#line 782 "misc.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp18_ = md5;
@@ -799,7 +796,7 @@ gchar* md5_file (GFile* file, GError** error) {
 	_g_checksum_free0 (md5);
 #line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 803 "misc.c"
+#line 800 "misc.c"
 }
 
 
@@ -829,7 +826,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 	_tmp2_ = a;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp2_ != NULL) {
-#line 833 "misc.c"
+#line 830 "misc.c"
 		GeeSet* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
@@ -841,25 +838,25 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		_tmp5_ = _tmp4_;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp5_ == 0;
-#line 845 "misc.c"
+#line 842 "misc.c"
 	} else {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = FALSE;
-#line 849 "misc.c"
+#line 846 "misc.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
-#line 853 "misc.c"
+#line 850 "misc.c"
 		GeeSet* _tmp6_ = NULL;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = b;
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = _tmp6_ == NULL;
-#line 859 "misc.c"
+#line 856 "misc.c"
 	} else {
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 863 "misc.c"
+#line 860 "misc.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
@@ -867,20 +864,20 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = TRUE;
 #line 109 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 871 "misc.c"
+#line 868 "misc.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp8_ = a;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp8_ == NULL) {
-#line 877 "misc.c"
+#line 874 "misc.c"
 		gboolean _tmp9_ = FALSE;
 		GeeSet* _tmp10_ = NULL;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp10_ = b;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp10_ != NULL) {
-#line 884 "misc.c"
+#line 881 "misc.c"
 			GeeSet* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -892,19 +889,19 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 			_tmp13_ = _tmp12_;
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = _tmp13_ == 0;
-#line 896 "misc.c"
+#line 893 "misc.c"
 		} else {
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp9_ = FALSE;
-#line 900 "misc.c"
+#line 897 "misc.c"
 		}
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = _tmp9_;
-#line 904 "misc.c"
+#line 901 "misc.c"
 	} else {
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp7_ = FALSE;
-#line 908 "misc.c"
+#line 905 "misc.c"
 	}
 #line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_) {
@@ -912,29 +909,29 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = TRUE;
 #line 112 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 916 "misc.c"
+#line 913 "misc.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp16_ = a;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp16_ == NULL) {
-#line 922 "misc.c"
+#line 919 "misc.c"
 		GeeSet* _tmp17_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp17_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp15_ = _tmp17_ != NULL;
-#line 928 "misc.c"
+#line 925 "misc.c"
 	} else {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp15_ = FALSE;
-#line 932 "misc.c"
+#line 929 "misc.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp15_) {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = TRUE;
-#line 938 "misc.c"
+#line 935 "misc.c"
 	} else {
 		gboolean _tmp18_ = FALSE;
 		GeeSet* _tmp19_ = NULL;
@@ -942,21 +939,21 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		_tmp19_ = a;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp19_ != NULL) {
-#line 946 "misc.c"
+#line 943 "misc.c"
 			GeeSet* _tmp20_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp20_ = b;
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp18_ = _tmp20_ == NULL;
-#line 952 "misc.c"
+#line 949 "misc.c"
 		} else {
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp18_ = FALSE;
-#line 956 "misc.c"
+#line 953 "misc.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp14_ = _tmp18_;
-#line 960 "misc.c"
+#line 957 "misc.c"
 	}
 #line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp14_) {
@@ -964,23 +961,23 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = FALSE;
 #line 115 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 968 "misc.c"
+#line 965 "misc.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp22_ = a;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp22_ == NULL) {
-#line 974 "misc.c"
+#line 971 "misc.c"
 		GeeSet* _tmp23_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp23_ = b;
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp21_ = _tmp23_ == NULL;
-#line 980 "misc.c"
+#line 977 "misc.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp21_ = FALSE;
-#line 984 "misc.c"
+#line 981 "misc.c"
 	}
 #line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp21_) {
@@ -988,7 +985,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = TRUE;
 #line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 992 "misc.c"
+#line 989 "misc.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp24_ = a;
@@ -1008,7 +1005,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		result = FALSE;
 #line 121 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1012 "misc.c"
+#line 1009 "misc.c"
 	}
 	{
 		GeeIterator* _element_it = NULL;
@@ -1022,7 +1019,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 		_element_it = _tmp31_;
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1026 "misc.c"
+#line 1023 "misc.c"
 			GeeIterator* _tmp32_ = NULL;
 			gboolean _tmp33_ = FALSE;
 			gchar* element = NULL;
@@ -1039,7 +1036,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 			if (!_tmp33_) {
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1043 "misc.c"
+#line 1040 "misc.c"
 			}
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp34_ = _element_it;
@@ -1063,28 +1060,28 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
 				_g_object_unref0 (_element_it);
 #line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
 				return result;
-#line 1067 "misc.c"
+#line 1064 "misc.c"
 			}
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1071 "misc.c"
+#line 1068 "misc.c"
 		}
 #line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1075 "misc.c"
+#line 1072 "misc.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = TRUE;
 #line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1081 "misc.c"
+#line 1078 "misc.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1088 "misc.c"
+#line 1085 "misc.c"
 }
 
 
@@ -1111,27 +1108,27 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	_tmp1_ = a;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != NULL) {
-#line 1115 "misc.c"
+#line 1112 "misc.c"
 		GeeSet* _tmp2_ = NULL;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = b;
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1121 "misc.c"
+#line 1118 "misc.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 1125 "misc.c"
+#line 1122 "misc.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
-#line 1129 "misc.c"
+#line 1126 "misc.c"
 		GeeSet* _tmp3_ = NULL;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = excluded;
 #line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp3_ != NULL) {
-#line 1135 "misc.c"
+#line 1132 "misc.c"
 			GeeSet* _tmp4_ = NULL;
 			GeeSet* _tmp5_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1140,39 +1137,39 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp5_ = a;
 #line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
 			gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1144 "misc.c"
+#line 1141 "misc.c"
 		}
 #line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
 #line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1150 "misc.c"
+#line 1147 "misc.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = a;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ == NULL) {
-#line 1156 "misc.c"
+#line 1153 "misc.c"
 		GeeSet* _tmp8_ = NULL;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp8_ = b;
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = _tmp8_ != NULL;
-#line 1162 "misc.c"
+#line 1159 "misc.c"
 	} else {
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = FALSE;
-#line 1166 "misc.c"
+#line 1163 "misc.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp6_) {
-#line 1170 "misc.c"
+#line 1167 "misc.c"
 		GeeSet* _tmp9_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = excluded;
 #line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp9_ != NULL) {
-#line 1176 "misc.c"
+#line 1173 "misc.c"
 			GeeSet* _tmp10_ = NULL;
 			GeeSet* _tmp11_ = NULL;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1181,19 +1178,19 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp11_ = b;
 #line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
 			gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1185 "misc.c"
+#line 1182 "misc.c"
 		}
 #line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
 		result = NULL;
 #line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1191 "misc.c"
+#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);
 #line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
 	intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet);
-#line 1197 "misc.c"
+#line 1194 "misc.c"
 	{
 		GeeIterator* _element_it = NULL;
 		GeeSet* _tmp13_ = NULL;
@@ -1206,7 +1203,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 		_element_it = _tmp14_;
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1210 "misc.c"
+#line 1207 "misc.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			gchar* element = NULL;
@@ -1223,7 +1220,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			if (!_tmp16_) {
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1227 "misc.c"
+#line 1224 "misc.c"
 			}
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp17_ = _element_it;
@@ -1239,7 +1236,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp21_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
 #line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp21_) {
-#line 1243 "misc.c"
+#line 1240 "misc.c"
 				GeeSet* _tmp22_ = NULL;
 				const gchar* _tmp23_ = NULL;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1248,14 +1245,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				_tmp23_ = element;
 #line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 1252 "misc.c"
+#line 1249 "misc.c"
 			} else {
 				GeeSet* _tmp24_ = NULL;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp24_ = excluded;
 #line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp24_ != NULL) {
-#line 1259 "misc.c"
+#line 1256 "misc.c"
 					GeeSet* _tmp25_ = NULL;
 					const gchar* _tmp26_ = NULL;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1264,16 +1261,16 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 					_tmp26_ = element;
 #line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_);
-#line 1268 "misc.c"
+#line 1265 "misc.c"
 				}
 			}
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1273 "misc.c"
+#line 1270 "misc.c"
 		}
 #line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1277 "misc.c"
+#line 1274 "misc.c"
 	}
 	{
 		GeeIterator* _element_it = NULL;
@@ -1287,7 +1284,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 		_element_it = _tmp28_;
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1291 "misc.c"
+#line 1288 "misc.c"
 			GeeIterator* _tmp29_ = NULL;
 			gboolean _tmp30_ = FALSE;
 			gchar* element = NULL;
@@ -1304,7 +1301,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			if (!_tmp30_) {
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1308 "misc.c"
+#line 1305 "misc.c"
 			}
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp31_ = _element_it;
@@ -1320,7 +1317,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 			_tmp35_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_);
 #line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
 			if (_tmp35_) {
-#line 1324 "misc.c"
+#line 1321 "misc.c"
 				GeeSet* _tmp36_ = NULL;
 				const gchar* _tmp37_ = NULL;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1329,14 +1326,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 				_tmp37_ = element;
 #line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
-#line 1333 "misc.c"
+#line 1330 "misc.c"
 			} else {
 				GeeSet* _tmp38_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_tmp38_ = excluded;
 #line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
 				if (_tmp38_ != NULL) {
-#line 1340 "misc.c"
+#line 1337 "misc.c"
 					GeeSet* _tmp39_ = NULL;
 					const gchar* _tmp40_ = NULL;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1345,16 +1342,16 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 					_tmp40_ = element;
 #line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_);
-#line 1349 "misc.c"
+#line 1346 "misc.c"
 				}
 			}
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_free0 (element);
-#line 1354 "misc.c"
+#line 1351 "misc.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_element_it);
-#line 1358 "misc.c"
+#line 1355 "misc.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp42_ = intersection;
@@ -1364,17 +1361,17 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	_tmp44_ = _tmp43_;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp44_ > 0) {
-#line 1368 "misc.c"
+#line 1365 "misc.c"
 		GeeSet* _tmp45_ = NULL;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp45_ = intersection;
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp41_ = _tmp45_;
-#line 1374 "misc.c"
+#line 1371 "misc.c"
 	} else {
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp41_ = NULL;
-#line 1378 "misc.c"
+#line 1375 "misc.c"
 	}
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp46_ = _g_object_ref0 (_tmp41_);
@@ -1384,7 +1381,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
 	_g_object_unref0 (intersection);
 #line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1388 "misc.c"
+#line 1385 "misc.c"
 }
 
 
@@ -1428,7 +1425,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	_ids_size_ = ids_length1;
 #line 171 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ctr = 0;
-#line 1432 "misc.c"
+#line 1429 "misc.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp4_ = NULL;
@@ -1441,7 +1438,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 		_photo_it = _tmp5_;
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1445 "misc.c"
+#line 1442 "misc.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Photo* photo = NULL;
@@ -1462,7 +1459,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 			if (!_tmp7_) {
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1466 "misc.c"
+#line 1463 "misc.c"
 			}
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = _photo_it;
@@ -1490,11 +1487,11 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 			_tmp15_ = _tmp10_[_tmp11_];
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_object_unref0 (photo);
-#line 1494 "misc.c"
+#line 1491 "misc.c"
 		}
 #line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_photo_it);
-#line 1498 "misc.c"
+#line 1495 "misc.c"
 	}
 #line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp16_ = photos;
@@ -1526,7 +1523,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	if (result_length1) {
 #line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*result_length1 = _tmp21__length1;
-#line 1530 "misc.c"
+#line 1527 "misc.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp21_;
@@ -1534,7 +1531,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
 	ids = (g_free (ids), NULL);
 #line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1538 "misc.c"
+#line 1535 "misc.c"
 }
 
 
@@ -1567,14 +1564,14 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	if (_tmp2_ <= ((gsize) 0)) {
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = TRUE;
-#line 1571 "misc.c"
+#line 1568 "misc.c"
 	} else {
 		guchar* _tmp3_ = NULL;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 1578 "misc.c"
+#line 1575 "misc.c"
 	}
 #line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
@@ -1582,7 +1579,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 		result = NULL;
 #line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1586 "misc.c"
+#line 1583 "misc.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = count;
@@ -1612,7 +1609,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	_tmp10_ = ids;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10__length1 = ids_length1;
-#line 1616 "misc.c"
+#line 1613 "misc.c"
 	{
 		gint64* id_collection = NULL;
 		gint id_collection_length1 = 0;
@@ -1624,11 +1621,11 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 		id_collection_length1 = _tmp10__length1;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 1628 "misc.c"
+#line 1625 "misc.c"
 			gint64 id = 0LL;
 #line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
 			id = id_collection[id_it];
-#line 1632 "misc.c"
+#line 1629 "misc.c"
 			{
 				GeeArrayList* _tmp11_ = NULL;
 				gint64 _tmp12_ = 0LL;
@@ -1641,7 +1638,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 				photo_id_init (&_tmp13_, _tmp12_);
 #line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp13_);
-#line 1645 "misc.c"
+#line 1642 "misc.c"
 			}
 		}
 	}
@@ -1651,7 +1648,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
 	ids = (g_free (ids), NULL);
 #line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1655 "misc.c"
+#line 1652 "misc.c"
 }
 
 
@@ -1695,7 +1692,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	_atoms_size_ = atoms_length1;
 #line 199 "/home/jens/Source/shotwell/src/util/misc.vala"
 	ctr = 0;
-#line 1699 "misc.c"
+#line 1696 "misc.c"
 	{
 		GeeIterator* _current_media_it = NULL;
 		GeeCollection* _tmp4_ = NULL;
@@ -1708,7 +1705,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 		_current_media_it = _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		while (TRUE) {
-#line 1712 "misc.c"
+#line 1709 "misc.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSource* current_media = NULL;
@@ -1730,7 +1727,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 			if (!_tmp7_) {
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 				break;
-#line 1734 "misc.c"
+#line 1731 "misc.c"
 			}
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp8_ = _current_media_it;
@@ -1762,11 +1759,11 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 			_g_free0 (_tmp14_);
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_g_object_unref0 (current_media);
-#line 1766 "misc.c"
+#line 1763 "misc.c"
 		}
 #line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_g_object_unref0 (_current_media_it);
-#line 1770 "misc.c"
+#line 1767 "misc.c"
 	}
 #line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp17_ = media;
@@ -1798,7 +1795,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	if (result_length1) {
 #line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*result_length1 = _tmp22__length1;
-#line 1802 "misc.c"
+#line 1799 "misc.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	result = _tmp22_;
@@ -1806,7 +1803,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
 	atoms = (g_free (atoms), NULL);
 #line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1810 "misc.c"
+#line 1807 "misc.c"
 }
 
 
@@ -1839,14 +1836,14 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	if (_tmp2_ <= ((gsize) 0)) {
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = TRUE;
-#line 1843 "misc.c"
+#line 1840 "misc.c"
 	} else {
 		guchar* _tmp3_ = NULL;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp3_ = serialized;
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 1850 "misc.c"
+#line 1847 "misc.c"
 	}
 #line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_) {
@@ -1854,7 +1851,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 		result = NULL;
 #line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 1858 "misc.c"
+#line 1855 "misc.c"
 	}
 #line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp4_ = count;
@@ -1884,7 +1881,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	_tmp10_ = atoms;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10__length1 = atoms_length1;
-#line 1888 "misc.c"
+#line 1885 "misc.c"
 	{
 		GdkAtom* current_atom_collection = NULL;
 		gint current_atom_collection_length1 = 0;
@@ -1896,11 +1893,11 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 		current_atom_collection_length1 = _tmp10__length1;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 		for (current_atom_it = 0; current_atom_it < _tmp10__length1; current_atom_it = current_atom_it + 1) {
-#line 1900 "misc.c"
+#line 1897 "misc.c"
 			GdkAtom current_atom = 0U;
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 			current_atom = current_atom_collection[current_atom_it];
-#line 1904 "misc.c"
+#line 1901 "misc.c"
 			{
 				MediaSource* media = NULL;
 				MediaCollectionRegistry* _tmp11_ = NULL;
@@ -1945,7 +1942,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
 #line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
 				_g_object_unref0 (media);
-#line 1949 "misc.c"
+#line 1946 "misc.c"
 			}
 		}
 	}
@@ -1955,7 +1952,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
 	atoms = (g_free (atoms), NULL);
 #line 225 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 1959 "misc.c"
+#line 1956 "misc.c"
 }
 
 
@@ -1971,37 +1968,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	gchar* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
-#line 2005 "misc.c"
+#line 2002 "misc.c"
 }
 
 
@@ -2037,7 +2034,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	_tmp3_ = _tmp2_.tm_year;
 #line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 2041 "misc.c"
+#line 2038 "misc.c"
 		gboolean _tmp4_ = FALSE;
 		struct tm _tmp5_ = {0};
 		gint _tmp6_ = 0;
@@ -2053,7 +2050,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 		_tmp8_ = _tmp7_.tm_mon;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp6_ == _tmp8_) {
-#line 2057 "misc.c"
+#line 2054 "misc.c"
 			struct tm _tmp9_ = {0};
 			gint _tmp10_ = 0;
 			struct tm _tmp11_ = {0};
@@ -2068,15 +2065,15 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			_tmp12_ = _tmp11_.tm_mday;
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = _tmp10_ == (_tmp12_ - 1);
-#line 2072 "misc.c"
+#line 2069 "misc.c"
 		} else {
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 			_tmp4_ = FALSE;
-#line 2076 "misc.c"
+#line 2073 "misc.c"
 		}
 #line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (_tmp4_) {
-#line 2080 "misc.c"
+#line 2077 "misc.c"
 			gchar* _tmp13_ = NULL;
 			gchar* _tmp14_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2091,7 +2088,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			_g_free0 (to_format);
 #line 238 "/home/jens/Source/shotwell/src/util/misc.vala"
 			to_format = _tmp14_;
-#line 2095 "misc.c"
+#line 2092 "misc.c"
 		} else {
 			gchar* _tmp15_ = NULL;
 			gchar* _tmp16_ = NULL;
@@ -2107,7 +2104,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 			_g_free0 (to_format);
 #line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
 			to_format = _tmp16_;
-#line 2111 "misc.c"
+#line 2108 "misc.c"
 		}
 	} else {
 		gchar* _tmp17_ = NULL;
@@ -2124,7 +2121,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 		_g_free0 (to_format);
 #line 249 "/home/jens/Source/shotwell/src/util/misc.vala"
 		to_format = _tmp18_;
-#line 2128 "misc.c"
+#line 2125 "misc.c"
 	}
 #line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp19_ = from_format;
@@ -2160,7 +2157,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
 	_g_free0 (from_format);
 #line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2164 "misc.c"
+#line 2161 "misc.c"
 }
 
 
@@ -2194,7 +2191,7 @@ gchar* format_local_date (struct tm* date) {
 	result = _tmp5_;
 #line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2198 "misc.c"
+#line 2195 "misc.c"
 }
 
 
@@ -2226,14 +2223,14 @@ OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar*
 	self->priv->callback_target = _tmp2__target;
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self;
-#line 2230 "misc.c"
+#line 2227 "misc.c"
 }
 
 
 OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target) {
 #line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return one_shot_scheduler_construct (TYPE_ONE_SHOT_SCHEDULER, name, callback, callback_target);
-#line 2237 "misc.c"
+#line 2234 "misc.c"
 }
 
 
@@ -2248,7 +2245,7 @@ gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) {
 	result = _tmp0_ != ((guint) 0);
 #line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2252 "misc.c"
+#line 2249 "misc.c"
 }
 
 
@@ -2257,7 +2254,7 @@ void one_shot_scheduler_at_idle (OneShotScheduler* self) {
 	g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
 #line 285 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_at_priority_idle (self, G_PRIORITY_DEFAULT_IDLE);
-#line 2261 "misc.c"
+#line 2258 "misc.c"
 }
 
 
@@ -2266,7 +2263,7 @@ static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self
 	result = one_shot_scheduler_callback_wrapper ((OneShotScheduler*) self);
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2270 "misc.c"
+#line 2267 "misc.c"
 }
 
 
@@ -2278,7 +2275,7 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 	_tmp0_ = self->priv->scheduled;
 #line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ == ((guint) 0)) {
-#line 2282 "misc.c"
+#line 2279 "misc.c"
 		gint _tmp1_ = 0;
 		guint _tmp2_ = 0U;
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2287,7 +2284,7 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
 		_tmp2_ = g_idle_add_full (_tmp1_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
 #line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->scheduled = _tmp2_;
-#line 2291 "misc.c"
+#line 2288 "misc.c"
 	}
 }
 
@@ -2303,7 +2300,7 @@ void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gbool
 	_tmp1_ = reschedule;
 #line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
 	one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, _tmp0_, _tmp1_);
-#line 2307 "misc.c"
+#line 2304 "misc.c"
 }
 
 
@@ -2320,35 +2317,35 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 	_tmp1_ = self->priv->scheduled;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 2324 "misc.c"
+#line 2321 "misc.c"
 		gboolean _tmp2_ = FALSE;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp2_ = reschedule;
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = !_tmp2_;
-#line 2330 "misc.c"
+#line 2327 "misc.c"
 	} else {
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp0_ = FALSE;
-#line 2334 "misc.c"
+#line 2331 "misc.c"
 	}
 #line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_) {
 #line 299 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return;
-#line 2340 "misc.c"
+#line 2337 "misc.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp3_ = self->priv->scheduled;
 #line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp3_ != ((guint) 0)) {
-#line 2346 "misc.c"
+#line 2343 "misc.c"
 		guint _tmp4_ = 0U;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp4_ = self->priv->scheduled;
 #line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_source_remove (_tmp4_);
-#line 2352 "misc.c"
+#line 2349 "misc.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp5_ = priority;
@@ -2358,7 +2355,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
 	_tmp7_ = g_timeout_add_full (_tmp5_, _tmp6_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
 #line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = _tmp7_;
-#line 2362 "misc.c"
+#line 2359 "misc.c"
 }
 
 
@@ -2373,7 +2370,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
 	if (_tmp0_ == ((guint) 0)) {
 #line 309 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return;
-#line 2377 "misc.c"
+#line 2374 "misc.c"
 	}
 #line 311 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp1_ = self->priv->scheduled;
@@ -2381,7 +2378,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
 	g_source_remove (_tmp1_);
 #line 312 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->scheduled = (guint) 0;
-#line 2385 "misc.c"
+#line 2382 "misc.c"
 }
 
 
@@ -2403,14 +2400,14 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) {
 	result = FALSE;
 #line 319 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return result;
-#line 2407 "misc.c"
+#line 2404 "misc.c"
 }
 
 
 static void value_one_shot_scheduler_init (GValue* value) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	value->data[0].v_pointer = NULL;
-#line 2414 "misc.c"
+#line 2411 "misc.c"
 }
 
 
@@ -2419,7 +2416,7 @@ static void value_one_shot_scheduler_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (value->data[0].v_pointer);
-#line 2423 "misc.c"
+#line 2420 "misc.c"
 	}
 }
 
@@ -2429,11 +2426,11 @@ static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = one_shot_scheduler_ref (src_value->data[0].v_pointer);
-#line 2433 "misc.c"
+#line 2430 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2437 "misc.c"
+#line 2434 "misc.c"
 	}
 }
 
@@ -2441,37 +2438,37 @@ static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue
 static gpointer value_one_shot_scheduler_peek_pointer (const GValue* value) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2445 "misc.c"
+#line 2442 "misc.c"
 }
 
 
 static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
-#line 2452 "misc.c"
+#line 2449 "misc.c"
 		OneShotScheduler* object;
 		object = collect_values[0].v_pointer;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2459 "misc.c"
+#line 2456 "misc.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2463 "misc.c"
+#line 2460 "misc.c"
 		}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = one_shot_scheduler_ref (object);
-#line 2467 "misc.c"
+#line 2464 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2471 "misc.c"
+#line 2468 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2475 "misc.c"
+#line 2472 "misc.c"
 }
 
 
@@ -2482,25 +2479,25 @@ static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n
 	if (!object_p) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2486 "misc.c"
+#line 2483 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!value->data[0].v_pointer) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = NULL;
-#line 2492 "misc.c"
+#line 2489 "misc.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2496 "misc.c"
+#line 2493 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2500 "misc.c"
+#line 2497 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2504 "misc.c"
+#line 2501 "misc.c"
 }
 
 
@@ -2514,7 +2511,7 @@ GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return G_PARAM_SPEC (spec);
-#line 2518 "misc.c"
+#line 2515 "misc.c"
 }
 
 
@@ -2523,7 +2520,7 @@ gpointer value_get_one_shot_scheduler (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER), NULL);
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2527 "misc.c"
+#line 2524 "misc.c"
 }
 
 
@@ -2543,17 +2540,17 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2547 "misc.c"
+#line 2544 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2551 "misc.c"
+#line 2548 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (old);
-#line 2557 "misc.c"
+#line 2554 "misc.c"
 	}
 }
 
@@ -2572,17 +2569,17 @@ void value_take_one_shot_scheduler (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 2576 "misc.c"
+#line 2573 "misc.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2580 "misc.c"
+#line 2577 "misc.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		one_shot_scheduler_unref (old);
-#line 2586 "misc.c"
+#line 2583 "misc.c"
 	}
 }
 
@@ -2594,7 +2591,7 @@ static void one_shot_scheduler_class_init (OneShotSchedulerClass * klass) {
 	((OneShotSchedulerClass *) klass)->finalize = one_shot_scheduler_finalize;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_type_class_add_private (klass, sizeof (OneShotSchedulerPrivate));
-#line 2598 "misc.c"
+#line 2595 "misc.c"
 }
 
 
@@ -2605,7 +2602,7 @@ static void one_shot_scheduler_instance_init (OneShotScheduler * self) {
 	self->priv->scheduled = (guint) 0;
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->ref_count = 1;
-#line 2609 "misc.c"
+#line 2606 "misc.c"
 }
 
 
@@ -2619,7 +2616,7 @@ static void one_shot_scheduler_finalize (OneShotScheduler* obj) {
 	one_shot_scheduler_cancel (self);
 #line 263 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_free0 (self->priv->name);
-#line 2623 "misc.c"
+#line 2620 "misc.c"
 }
 
 
@@ -2644,7 +2641,7 @@ gpointer one_shot_scheduler_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return instance;
-#line 2648 "misc.c"
+#line 2645 "misc.c"
 }
 
 
@@ -2657,7 +2654,7 @@ void one_shot_scheduler_unref (gpointer instance) {
 		ONE_SHOT_SCHEDULER_GET_CLASS (self)->finalize (self);
 #line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2661 "misc.c"
+#line 2658 "misc.c"
 	}
 }
 
@@ -2680,14 +2677,14 @@ OpTimer* op_timer_construct (GType object_type, const gchar* name) {
 	self->priv->name = _tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return self;
-#line 2684 "misc.c"
+#line 2681 "misc.c"
 }
 
 
 OpTimer* op_timer_new (const gchar* name) {
 #line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return op_timer_construct (TYPE_OP_TIMER, name);
-#line 2691 "misc.c"
+#line 2688 "misc.c"
 }
 
 
@@ -2699,7 +2696,7 @@ void op_timer_start (OpTimer* self) {
 	_tmp0_ = self->priv->timer;
 #line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_timer_start (_tmp0_);
-#line 2703 "misc.c"
+#line 2700 "misc.c"
 }
 
 
@@ -2734,13 +2731,13 @@ void op_timer_stop (OpTimer* self) {
 	_tmp5_ = self->priv->shortest;
 #line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp4_ < _tmp5_) {
-#line 2738 "misc.c"
+#line 2735 "misc.c"
 		gdouble _tmp6_ = 0.0;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp6_ = time;
 #line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->shortest = _tmp6_;
-#line 2744 "misc.c"
+#line 2741 "misc.c"
 	}
 #line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp7_ = time;
@@ -2748,19 +2745,19 @@ void op_timer_stop (OpTimer* self) {
 	_tmp8_ = self->priv->longest;
 #line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp7_ > _tmp8_) {
-#line 2752 "misc.c"
+#line 2749 "misc.c"
 		gdouble _tmp9_ = 0.0;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
 		_tmp9_ = time;
 #line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
 		self->priv->longest = _tmp9_;
-#line 2758 "misc.c"
+#line 2755 "misc.c"
 	}
 #line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_tmp10_ = self->priv->count;
 #line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->priv->count = _tmp10_ + 1;
-#line 2764 "misc.c"
+#line 2761 "misc.c"
 }
 
 
@@ -2773,7 +2770,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 	_tmp0_ = self->priv->count;
 #line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (_tmp0_ > ((glong) 0)) {
-#line 2777 "misc.c"
+#line 2774 "misc.c"
 		const gchar* _tmp1_ = NULL;
 		glong _tmp2_ = 0L;
 		gdouble _tmp3_ = 0.0;
@@ -2802,7 +2799,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 		result = _tmp8_;
 #line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 2806 "misc.c"
+#line 2803 "misc.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -2814,7 +2811,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 		result = _tmp10_;
 #line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return result;
-#line 2818 "misc.c"
+#line 2815 "misc.c"
 	}
 }
 
@@ -2822,7 +2819,7 @@ gchar* op_timer_to_string (OpTimer* self) {
 static void value_op_timer_init (GValue* value) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	value->data[0].v_pointer = NULL;
-#line 2826 "misc.c"
+#line 2823 "misc.c"
 }
 
 
@@ -2831,7 +2828,7 @@ static void value_op_timer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (value->data[0].v_pointer);
-#line 2835 "misc.c"
+#line 2832 "misc.c"
 	}
 }
 
@@ -2841,11 +2838,11 @@ static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_val
 	if (src_value->data[0].v_pointer) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = op_timer_ref (src_value->data[0].v_pointer);
-#line 2845 "misc.c"
+#line 2842 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2849 "misc.c"
+#line 2846 "misc.c"
 	}
 }
 
@@ -2853,37 +2850,37 @@ static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_val
 static gpointer value_op_timer_peek_pointer (const GValue* value) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2857 "misc.c"
+#line 2854 "misc.c"
 }
 
 
 static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (collect_values[0].v_pointer) {
-#line 2864 "misc.c"
+#line 2861 "misc.c"
 		OpTimer* object;
 		object = collect_values[0].v_pointer;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2871 "misc.c"
+#line 2868 "misc.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2875 "misc.c"
+#line 2872 "misc.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = op_timer_ref (object);
-#line 2879 "misc.c"
+#line 2876 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2883 "misc.c"
+#line 2880 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2887 "misc.c"
+#line 2884 "misc.c"
 }
 
 
@@ -2894,25 +2891,25 @@ static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_v
 	if (!object_p) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2898 "misc.c"
+#line 2895 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (!value->data[0].v_pointer) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = NULL;
-#line 2904 "misc.c"
+#line 2901 "misc.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2908 "misc.c"
+#line 2905 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		*object_p = op_timer_ref (value->data[0].v_pointer);
-#line 2912 "misc.c"
+#line 2909 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return NULL;
-#line 2916 "misc.c"
+#line 2913 "misc.c"
 }
 
 
@@ -2926,7 +2923,7 @@ GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return G_PARAM_SPEC (spec);
-#line 2930 "misc.c"
+#line 2927 "misc.c"
 }
 
 
@@ -2935,7 +2932,7 @@ gpointer value_get_op_timer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER), NULL);
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return value->data[0].v_pointer;
-#line 2939 "misc.c"
+#line 2936 "misc.c"
 }
 
 
@@ -2955,17 +2952,17 @@ void value_set_op_timer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_ref (value->data[0].v_pointer);
-#line 2959 "misc.c"
+#line 2956 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2963 "misc.c"
+#line 2960 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (old);
-#line 2969 "misc.c"
+#line 2966 "misc.c"
 	}
 }
 
@@ -2984,17 +2981,17 @@ void value_take_op_timer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = v_object;
-#line 2988 "misc.c"
+#line 2985 "misc.c"
 	} else {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		value->data[0].v_pointer = NULL;
-#line 2992 "misc.c"
+#line 2989 "misc.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	if (old) {
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		op_timer_unref (old);
-#line 2998 "misc.c"
+#line 2995 "misc.c"
 	}
 }
 
@@ -3006,7 +3003,7 @@ static void op_timer_class_init (OpTimerClass * klass) {
 	((OpTimerClass *) klass)->finalize = op_timer_finalize;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	g_type_class_add_private (klass, sizeof (OpTimerPrivate));
-#line 3010 "misc.c"
+#line 3007 "misc.c"
 }
 
 
@@ -3028,7 +3025,7 @@ static void op_timer_instance_init (OpTimer * self) {
 	self->priv->longest = DBL_MIN;
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	self->ref_count = 1;
-#line 3032 "misc.c"
+#line 3029 "misc.c"
 }
 
 
@@ -3042,7 +3039,7 @@ static void op_timer_finalize (OpTimer* obj) {
 	_g_free0 (self->priv->name);
 #line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
 	_g_timer_destroy0 (self->priv->timer);
-#line 3046 "misc.c"
+#line 3043 "misc.c"
 }
 
 
@@ -3067,7 +3064,7 @@ gpointer op_timer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 	return instance;
-#line 3071 "misc.c"
+#line 3068 "misc.c"
 }
 
 
@@ -3080,58 +3077,9 @@ void op_timer_unref (gpointer instance) {
 		OP_TIMER_GET_CLASS (self)->finalize (self);
 #line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3084 "misc.c"
+#line 3081 "misc.c"
 	}
 }
 
 
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message) {
-#line 369 "/home/jens/Source/shotwell/src/util/misc.vala"
-	g_return_if_fail (message != NULL);
-#line 3092 "misc.c"
-}
-
-
-static void g_time_local (time_t time, struct tm* result) {
-	struct tm _result_ = {0};
-	struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return;
-#line 3107 "misc.c"
-}
-
-
-gboolean is_twentyfour_hr_time_system (void) {
-	gboolean result = FALSE;
-	struct tm _tmp0_ = {0};
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	g_time_local ((time_t) 0, &_tmp0_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp1_ = g_time_format (&_tmp0_, "%p");
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp2_ = _tmp1_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp3_ = is_string_empty (_tmp2_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_tmp4_ = _tmp3_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	_g_free0 (_tmp2_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	result = _tmp4_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
-	return result;
-#line 3134 "misc.c"
-}
-
-