From 66f6a7bd3f7e00022191f16cb0e82a39e7333a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 2 Jan 2017 11:24:12 +0100 Subject: New upstream version 0.25.2 --- src/DesktopIntegration.c | 54 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/DesktopIntegration.c') diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c index b82e24c..63d3682 100644 --- a/src/DesktopIntegration.c +++ b/src/DesktopIntegration.c @@ -1,4 +1,4 @@ -/* DesktopIntegration.c generated by valac 0.34.2, the Vala compiler +/* DesktopIntegration.c generated by valac 0.32.1, the Vala compiler * generated from DesktopIntegration.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -484,17 +484,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.34/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1376 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1377 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 500 "DesktopIntegration.c" } @@ -1173,7 +1173,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) { #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1176 "DesktopIntegration.c" - goto __catch564_g_error; + goto __catch562_g_error; } #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp21_ = app_window_get_instance (); @@ -1185,8 +1185,8 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) { _g_object_unref0 (_tmp22_); #line 1187 "DesktopIntegration.c" } - goto __finally564; - __catch564_g_error: + goto __finally562; + __catch562_g_error: { GError* err = NULL; AppWindow* _tmp23_ = NULL; @@ -1226,7 +1226,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) { _g_error_free0 (err); #line 1228 "DesktopIntegration.c" } - __finally564: + __finally562: #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -1568,11 +1568,11 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1571 "DesktopIntegration.c" - goto __catch565_g_error; + goto __catch563_g_error; } } - goto __finally565; - __catch565_g_error: + goto __finally563; + __catch563_g_error: { GError* err = NULL; const gchar* _tmp27_ = NULL; @@ -1617,7 +1617,7 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea return; #line 1619 "DesktopIntegration.c" } - __finally565: + __finally563: #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -1802,7 +1802,7 @@ void desktop_integration_background_slideshow_xml_builder_open (DesktopIntegrati #line 1803 "DesktopIntegration.c" } #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - _tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_output_stream_get_type (), GOutputStream)); + _tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OUTPUT_STREAM, GOutputStream)); #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (self->priv->outs); #line 211 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2200,7 +2200,7 @@ GFile* desktop_integration_background_slideshow_xml_builder_close (DesktopIntegr #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp7_ = self->priv->outs; #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" - g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_); + g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_); #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 254 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2588,11 +2588,11 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2591 "DesktopIntegration.c" - goto __catch566_g_error; + goto __catch564_g_error; } } - goto __finally566; - __catch566_g_error: + goto __finally564; + __catch564_g_error: { GError* err = NULL; GError* _tmp8_ = NULL; @@ -2612,7 +2612,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl _g_error_free0 (err); #line 2613 "DesktopIntegration.c" } - __finally566: + __finally564: #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" @@ -2747,7 +2747,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2749 "DesktopIntegration.c" - goto __catch567_g_error; + goto __catch565_g_error; } #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp10_ = exporter; @@ -2789,7 +2789,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL); #line 2791 "DesktopIntegration.c" - goto __catch567_g_error; + goto __catch565_g_error; } #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _g_object_unref0 (file); @@ -2809,7 +2809,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 2811 "DesktopIntegration.c" - goto __catch567_g_error; + goto __catch565_g_error; } #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" _tmp19_ = _tmp16_; @@ -2823,8 +2823,8 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo _g_object_unref0 (_tmp16_); #line 2824 "DesktopIntegration.c" } - goto __finally567; - __catch567_g_error: + goto __finally565; + __catch565_g_error: { GError* err = NULL; const gchar* _tmp20_ = NULL; @@ -2860,7 +2860,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo return; #line 2861 "DesktopIntegration.c" } - __finally567: + __finally565: #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala" -- cgit v1.2.3