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

1 files changed, 106 insertions, 106 deletions

diff --git a/src/Debug.c b/src/Debug.c
index e9d753f..3529b39 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -1,4 +1,4 @@
-/* Debug.c generated by valac 0.34.7, the Vala compiler
+/* Debug.c generated by valac 0.36.6, the Vala compiler
  * generated from Debug.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -97,20 +97,20 @@ static void _debug_critical_handler_glog_func (const gchar* log_domain, GLogLeve
 
 
 void debug_init (const gchar* app_version_prefix) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	FILE* _tmp2_ = NULL;
-	FILE* _tmp3_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	FILE* _tmp2_;
+	FILE* _tmp3_;
 	gchar* log_file_error_msg = NULL;
 	GFile* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp5_;
 	GFile* log_file = NULL;
-	GFile* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	const gchar* _tmp34_ = NULL;
+	GFile* _tmp7_;
+	GFile* _tmp8_;
+	const gchar* _tmp34_;
 	gboolean _tmp55_ = FALSE;
-	GLogLevelFlags _tmp56_ = 0;
-	const gchar* _tmp58_ = NULL;
+	GLogLevelFlags _tmp56_;
+	const gchar* _tmp58_;
 	GError * _inner_error_ = NULL;
 #line 27 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (app_version_prefix != NULL);
@@ -137,7 +137,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 37 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (g_strcmp0 (_tmp5_, DEBUG_LIBRARY_PREFIX) == 0) {
 #line 140 "Debug.c"
-		GFile* _tmp6_ = NULL;
+		GFile* _tmp6_;
 #line 37 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp6_ = app_dirs_get_log_file ();
 #line 37 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -162,13 +162,13 @@ void debug_init (const gchar* app_version_prefix) {
 	if (_tmp8_ != NULL) {
 #line 164 "Debug.c"
 		GFile* log_dir = NULL;
-		GFile* _tmp9_ = NULL;
-		GFile* _tmp10_ = NULL;
-		GFile* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		FILE* _tmp26_ = NULL;
-		FILE* _tmp27_ = NULL;
+		GFile* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		FILE* _tmp26_;
+		FILE* _tmp27_;
 #line 39 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp9_ = log_file;
 #line 39 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -177,8 +177,8 @@ void debug_init (const gchar* app_version_prefix) {
 		log_dir = _tmp10_;
 #line 179 "Debug.c"
 		{
-			GFile* _tmp11_ = NULL;
-			gboolean _tmp12_ = FALSE;
+			GFile* _tmp11_;
+			gboolean _tmp12_;
 #line 41 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp11_ = log_dir;
 #line 41 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -187,8 +187,8 @@ void debug_init (const gchar* app_version_prefix) {
 			if (_tmp12_ == FALSE) {
 #line 189 "Debug.c"
 				gboolean _tmp13_ = FALSE;
-				GFile* _tmp14_ = NULL;
-				gboolean _tmp15_ = FALSE;
+				GFile* _tmp14_;
+				gboolean _tmp15_;
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				_tmp14_ = log_dir;
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -198,15 +198,15 @@ void debug_init (const gchar* app_version_prefix) {
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "Debug.c"
-					goto __catch432_g_error;
+					goto __catch433_g_error;
 				}
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (!_tmp13_) {
 #line 206 "Debug.c"
-					GFile* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
-					gchar* _tmp18_ = NULL;
-					gchar* _tmp19_ = NULL;
+					GFile* _tmp16_;
+					gchar* _tmp17_;
+					gchar* _tmp18_;
+					gchar* _tmp19_;
 #line 43 "/home/jens/Source/shotwell/src/Debug.vala"
 					_tmp16_ = log_dir;
 #line 43 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -225,13 +225,13 @@ void debug_init (const gchar* app_version_prefix) {
 				}
 			}
 		}
-		goto __finally432;
-		__catch432_g_error:
+		goto __finally433;
+		__catch433_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
+			GError* _tmp20_;
+			const gchar* _tmp21_;
+			gchar* _tmp22_;
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 			err = _inner_error_;
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -250,7 +250,7 @@ void debug_init (const gchar* app_version_prefix) {
 			_g_error_free0 (err);
 #line 252 "Debug.c"
 		}
-		__finally432:
+		__finally433:
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -288,8 +288,8 @@ void debug_init (const gchar* app_version_prefix) {
 #line 54 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp27_ != NULL) {
 #line 291 "Debug.c"
-			FILE* _tmp28_ = NULL;
-			FILE* _tmp29_ = NULL;
+			FILE* _tmp28_;
+			FILE* _tmp29_;
 #line 55 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp28_ = debug_log_file_stream;
 #line 55 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -300,10 +300,10 @@ void debug_init (const gchar* app_version_prefix) {
 			debug_log_err = _tmp29_;
 #line 302 "Debug.c"
 		} else {
-			GFile* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
+			GFile* _tmp30_;
+			gchar* _tmp31_;
+			gchar* _tmp32_;
+			gchar* _tmp33_;
 #line 58 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp30_ = log_file;
 #line 58 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -333,28 +333,28 @@ void debug_init (const gchar* app_version_prefix) {
 #line 334 "Debug.c"
 	} else {
 		GLogLevelFlags _tmp35_ = 0;
-		const gchar* _tmp36_ = NULL;
+		const gchar* _tmp36_;
 		GLogLevelFlags _tmp39_ = 0;
-		const gchar* _tmp40_ = NULL;
+		const gchar* _tmp40_;
 		GLogLevelFlags _tmp43_ = 0;
-		const gchar* _tmp44_ = NULL;
+		const gchar* _tmp44_;
 		GLogLevelFlags _tmp47_ = 0;
-		const gchar* _tmp48_ = NULL;
+		const gchar* _tmp48_;
 		GLogLevelFlags _tmp51_ = 0;
-		const gchar* _tmp52_ = NULL;
+		const gchar* _tmp52_;
 #line 65 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp36_ = g_getenv ("SHOTWELL_INFO");
 #line 65 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp36_ != NULL) {
 #line 350 "Debug.c"
-			GLogLevelFlags _tmp37_ = 0;
+			GLogLevelFlags _tmp37_;
 #line 66 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp37_ = debug_log_mask;
 #line 66 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp35_ = _tmp37_ | G_LOG_LEVEL_INFO;
 #line 356 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp38_ = 0;
+			GLogLevelFlags _tmp38_;
 #line 67 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp38_ = debug_log_mask;
 #line 67 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -368,14 +368,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 68 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp40_ != NULL) {
 #line 371 "Debug.c"
-			GLogLevelFlags _tmp41_ = 0;
+			GLogLevelFlags _tmp41_;
 #line 69 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp41_ = debug_log_mask;
 #line 69 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp39_ = _tmp41_ | G_LOG_LEVEL_DEBUG;
 #line 377 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp42_ = 0;
+			GLogLevelFlags _tmp42_;
 #line 70 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp42_ = debug_log_mask;
 #line 70 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -389,14 +389,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 71 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp44_ != NULL) {
 #line 392 "Debug.c"
-			GLogLevelFlags _tmp45_ = 0;
+			GLogLevelFlags _tmp45_;
 #line 72 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp45_ = debug_log_mask;
 #line 72 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp43_ = _tmp45_ | G_LOG_LEVEL_MESSAGE;
 #line 398 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp46_ = 0;
+			GLogLevelFlags _tmp46_;
 #line 73 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp46_ = debug_log_mask;
 #line 73 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -410,14 +410,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 74 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp48_ != NULL) {
 #line 413 "Debug.c"
-			GLogLevelFlags _tmp49_ = 0;
+			GLogLevelFlags _tmp49_;
 #line 75 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp49_ = debug_log_mask;
 #line 75 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp47_ = _tmp49_ | G_LOG_LEVEL_WARNING;
 #line 419 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp50_ = 0;
+			GLogLevelFlags _tmp50_;
 #line 76 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp50_ = debug_log_mask;
 #line 76 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -431,14 +431,14 @@ void debug_init (const gchar* app_version_prefix) {
 #line 77 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp52_ != NULL) {
 #line 434 "Debug.c"
-			GLogLevelFlags _tmp53_ = 0;
+			GLogLevelFlags _tmp53_;
 #line 78 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp53_ = debug_log_mask;
 #line 78 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp51_ = _tmp53_ | G_LOG_LEVEL_CRITICAL;
 #line 440 "Debug.c"
 		} else {
-			GLogLevelFlags _tmp54_ = 0;
+			GLogLevelFlags _tmp54_;
 #line 79 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp54_ = debug_log_mask;
 #line 79 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -464,7 +464,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 88 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp56_ == 0) {
 #line 467 "Debug.c"
-		GFile* _tmp57_ = NULL;
+		GFile* _tmp57_;
 #line 88 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp57_ = log_file;
 #line 88 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -486,7 +486,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 94 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp58_ != NULL) {
 #line 489 "Debug.c"
-		const gchar* _tmp59_ = NULL;
+		const gchar* _tmp59_;
 #line 95 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp59_ = log_file_error_msg;
 #line 95 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -509,8 +509,8 @@ void debug_terminate (void) {
 
 gboolean debug_is_enabled (GLogLevelFlags flag) {
 	gboolean result = FALSE;
-	GLogLevelFlags _tmp0_ = 0;
-	GLogLevelFlags _tmp1_ = 0;
+	GLogLevelFlags _tmp0_;
+	GLogLevelFlags _tmp1_;
 #line 103 "/home/jens/Source/shotwell/src/Debug.vala"
 	_tmp0_ = debug_log_mask;
 #line 103 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -526,13 +526,13 @@ gboolean debug_is_enabled (GLogLevelFlags flag) {
 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"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2846 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2847 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return;
 #line 538 "Debug.c"
 }
@@ -540,30 +540,30 @@ static void g_time_local (time_t time, struct tm* result) {
 
 static gchar* g_time_to_string (struct tm *self) {
 	gchar* result = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	gchar* _tmp6_ = NULL;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	gchar* _tmp6_;
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = (*self).tm_year;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = (*self).tm_mon;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = (*self).tm_mday;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = (*self).tm_hour;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp4_ = (*self).tm_min;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = (*self).tm_sec;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp6_ = g_strdup_printf ("%04d-%02d-%02d %02d:%02d:%02d", _tmp0_ + 1900, _tmp1_ + 1, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp6_;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2851 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 569 "Debug.c"
 }
@@ -571,16 +571,16 @@ static gchar* g_time_to_string (struct tm *self) {
 
 void debug_log (FILE* stream, const gchar* prefix, const gchar* message) {
 	time_t now = 0;
-	time_t _tmp0_ = 0;
-	FILE* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	pid_t _tmp3_ = 0;
+	time_t _tmp0_;
+	FILE* _tmp1_;
+	const gchar* _tmp2_;
+	pid_t _tmp3_;
 	struct tm _tmp4_ = {0};
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	FILE* _tmp9_ = NULL;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	const gchar* _tmp8_;
+	FILE* _tmp9_;
 #line 106 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (stream != NULL);
 #line 106 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -620,7 +620,7 @@ void debug_log (FILE* stream, const gchar* prefix, const gchar* message) {
 
 
 void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 118 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 119 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -628,8 +628,8 @@ void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar*
 #line 119 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 631 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 120 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_out;
 #line 120 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -642,7 +642,7 @@ void debug_info_handler (const gchar* domain, GLogLevelFlags flags, const gchar*
 
 
 void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 123 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 124 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -650,8 +650,8 @@ void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar
 #line 124 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 653 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 125 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_out;
 #line 125 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -664,7 +664,7 @@ void debug_debug_handler (const gchar* domain, GLogLevelFlags flags, const gchar
 
 
 void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 129 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -672,8 +672,8 @@ void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gch
 #line 129 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 675 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 130 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_err;
 #line 130 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -686,7 +686,7 @@ void debug_message_handler (const gchar* domain, GLogLevelFlags flags, const gch
 
 
 void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 133 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 134 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -694,8 +694,8 @@ void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gch
 #line 134 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 697 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
 #line 135 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_err;
 #line 135 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -708,7 +708,7 @@ void debug_warning_handler (const gchar* domain, GLogLevelFlags flags, const gch
 
 
 void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gchar* message) {
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 138 "/home/jens/Source/shotwell/src/Debug.vala"
 	g_return_if_fail (message != NULL);
 #line 139 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -716,9 +716,9 @@ void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gc
 #line 139 "/home/jens/Source/shotwell/src/Debug.vala"
 	if (_tmp0_) {
 #line 719 "Debug.c"
-		FILE* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		FILE* _tmp3_ = NULL;
+		FILE* _tmp1_;
+		const gchar* _tmp2_;
+		FILE* _tmp3_;
 #line 140 "/home/jens/Source/shotwell/src/Debug.vala"
 		_tmp1_ = debug_log_err;
 #line 140 "/home/jens/Source/shotwell/src/Debug.vala"
@@ -730,8 +730,8 @@ void debug_critical_handler (const gchar* domain, GLogLevelFlags flags, const gc
 #line 141 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (_tmp3_ != NULL) {
 #line 733 "Debug.c"
-			FILE* _tmp4_ = NULL;
-			const gchar* _tmp5_ = NULL;
+			FILE* _tmp4_;
+			const gchar* _tmp5_;
 #line 142 "/home/jens/Source/shotwell/src/Debug.vala"
 			_tmp4_ = stderr;
 #line 142 "/home/jens/Source/shotwell/src/Debug.vala"