From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- src/main.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 83f5416..d549d88 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.32.1, the Vala compiler +/* main.c generated by valac 0.34.4, the Vala compiler * generated from main.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -835,11 +835,11 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 35 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 838 "main.c" - goto __catch218_g_error; + goto __catch220_g_error; } } - goto __finally218; - __catch218_g_error: + goto __finally220; + __catch220_g_error: { GError* err = NULL; GError* _tmp7_ = NULL; @@ -860,7 +860,7 @@ void library_exec (gchar** mounts, int mounts_length1) { return; #line 862 "main.c" } - __finally218: + __finally220: #line 34 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 34 "/home/jens/Source/shotwell/src/main.vala" @@ -1218,7 +1218,7 @@ void library_exec (gchar** mounts, int mounts_length1) { #line 109 "/home/jens/Source/shotwell/src/main.vala" _g_free0 (icon_path); #line 1214 "main.c" - goto __catch219_g_error; + goto __catch221_g_error; } #line 109 "/home/jens/Source/shotwell/src/main.vala" _tmp72_ = progress_dialog; @@ -1230,8 +1230,8 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_free0 (icon_path); #line 1225 "main.c" } - goto __finally219; - __catch219_g_error: + goto __finally221; + __catch221_g_error: { GError* err = NULL; GError* _tmp73_ = NULL; @@ -1251,7 +1251,7 @@ void library_exec (gchar** mounts, int mounts_length1) { _g_error_free0 (err); #line 1245 "main.c" } - __finally219: + __finally221: #line 107 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 107 "/home/jens/Source/shotwell/src/main.vala" @@ -1927,11 +1927,11 @@ void editing_exec (const gchar* filename) { #line 253 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1922 "main.c" - goto __catch220_g_error; + goto __catch222_g_error; } } - goto __finally220; - __catch220_g_error: + goto __finally222; + __catch222_g_error: { GError* err = NULL; GError* _tmp3_ = NULL; @@ -1954,7 +1954,7 @@ void editing_exec (const gchar* filename) { return; #line 1948 "main.c" } - __finally220: + __finally222: #line 252 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 252 "/home/jens/Source/shotwell/src/main.vala" @@ -2350,17 +2350,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2358 "main.c" } @@ -2468,11 +2468,11 @@ void _vala_main (gchar** args, int args_length1) { #line 338 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2463 "main.c" - goto __catch221_g_error; + goto __catch223_g_error; } } - goto __finally221; - __catch221_g_error: + goto __finally223; + __catch223_g_error: { GError* e = NULL; GError* _tmp15_ = NULL; @@ -2517,7 +2517,7 @@ void _vala_main (gchar** args, int args_length1) { return; #line 2511 "main.c" } - __finally221: + __finally223: #line 337 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 337 "/home/jens/Source/shotwell/src/main.vala" @@ -2926,7 +2926,7 @@ void _vala_main (gchar** args, int args_length1) { #line 442 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (src); #line 2921 "main.c" - goto __catch222_g_error; + goto __catch224_g_error; } #line 439 "/home/jens/Source/shotwell/src/main.vala" _g_object_unref0 (dest); @@ -2934,8 +2934,8 @@ void _vala_main (gchar** args, int args_length1) { _g_object_unref0 (src); #line 2928 "main.c" } - goto __finally222; - __catch222_g_error: + goto __finally224; + __catch224_g_error: { GError* _error_ = NULL; GError* _tmp85_ = NULL; @@ -2954,7 +2954,7 @@ void _vala_main (gchar** args, int args_length1) { _g_error_free0 (_error_); #line 2948 "main.c" } - __finally222: + __finally224: #line 439 "/home/jens/Source/shotwell/src/main.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 439 "/home/jens/Source/shotwell/src/main.vala" -- cgit v1.2.3