Merge tag 'upstream/0.25.2'

Upstream version 0.25.2

1 files changed, 18 insertions, 18 deletions

diff --git a/src/Debug.c b/src/Debug.c
index 5ce4ad8..7711599 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -1,4 +1,4 @@
-/* Debug.c generated by valac 0.34.2, the Vala compiler
+/* Debug.c generated by valac 0.32.1, the Vala compiler
  * generated from Debug.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -198,7 +198,7 @@ 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 __catch431_g_error;
+					goto __catch429_g_error;
 				}
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (!_tmp13_) {
@@ -225,8 +225,8 @@ void debug_init (const gchar* app_version_prefix) {
 				}
 			}
 		}
-		goto __finally431;
-		__catch431_g_error:
+		goto __finally429;
+		__catch429_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
@@ -250,7 +250,7 @@ void debug_init (const gchar* app_version_prefix) {
 			_g_error_free0 (err);
 #line 252 "Debug.c"
 		}
-		__finally431:
+		__finally429:
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 40 "/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 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	*result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return;
 #line 538 "Debug.c"
 }
@@ -547,23 +547,23 @@ static gchar* g_time_to_string (struct tm *self) {
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
 	gchar* _tmp6_ = NULL;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp0_ = (*self).tm_year;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp1_ = (*self).tm_mon;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp2_ = (*self).tm_mday;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp3_ = (*self).tm_hour;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp4_ = (*self).tm_min;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	_tmp5_ = (*self).tm_sec;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/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 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	result = _tmp6_;
-#line 2755 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2706 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
 	return result;
 #line 569 "Debug.c"
 }