summaryrefslogtreecommitdiff
path: root/src/DesktopIntegration.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
commitf39ea21098340bd99c48669f152c9068046c2c99 (patch)
treed1166fce1a4a8c470dfaf364816f767678c4729e /src/DesktopIntegration.c
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/DesktopIntegration.c')
-rw-r--r--src/DesktopIntegration.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index 63d3682..0c25115 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1,4 +1,4 @@
-/* DesktopIntegration.c generated by valac 0.32.1, the Vala compiler
+/* DesktopIntegration.c generated by valac 0.34.4, 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.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 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 __catch562_g_error;
+ goto __catch564_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 __finally562;
- __catch562_g_error:
+ goto __finally564;
+ __catch564_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"
}
- __finally562:
+ __finally564:
#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 __catch563_g_error;
+ goto __catch565_g_error;
}
}
- goto __finally563;
- __catch563_g_error:
+ goto __finally565;
+ __catch565_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"
}
- __finally563:
+ __finally565:
#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_TYPE_OUTPUT_STREAM, GOutputStream));
+ _tmp3_ = g_data_output_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_output_stream_get_type (), 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_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
+ g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_output_stream_get_type (), 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 __catch564_g_error;
+ goto __catch566_g_error;
}
}
- goto __finally564;
- __catch564_g_error:
+ goto __finally566;
+ __catch566_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"
}
- __finally564:
+ __finally566:
#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 __catch565_g_error;
+ goto __catch567_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 __catch565_g_error;
+ goto __catch567_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 __catch565_g_error;
+ goto __catch567_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 __finally565;
- __catch565_g_error:
+ goto __finally567;
+ __catch567_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"
}
- __finally565:
+ __finally567:
#line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"