summaryrefslogtreecommitdiff
path: root/src/Dialogs.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/Dialogs.c
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/Dialogs.c')
-rw-r--r--src/Dialogs.c292
1 files changed, 146 insertions, 146 deletions
diff --git a/src/Dialogs.c b/src/Dialogs.c
index 3db0786..fdd6e47 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -1,4 +1,4 @@
-/* Dialogs.c generated by valac 0.32.1, the Vala compiler
+/* Dialogs.c generated by valac 0.34.4, the Vala compiler
* generated from Dialogs.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -3976,15 +3976,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 3986 "Dialogs.c"
}
@@ -8774,39 +8774,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
gint _tmp3__length1 = 0;
guint8* _tmp4_ = NULL;
gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = -1;
-#line 1399 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (result_length1) {
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
#line 8791 "Dialogs.c"
}
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1401 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 8797 "Dialogs.c"
}
@@ -8921,7 +8921,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 8909 "Dialogs.c"
- goto __catch421_g_error;
+ goto __catch423_g_error;
}
#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp18_ = outstream;
@@ -8934,31 +8934,31 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp21__length1 = _tmp20__length1;
#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
- g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, G_TYPE_OUTPUT_STREAM, GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
+ g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, g_output_stream_get_type (), GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
_g_object_unref0 (outstream);
#line 8928 "Dialogs.c"
- goto __catch421_g_error;
+ goto __catch423_g_error;
}
#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp22_ = outstream;
#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
- g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, G_TYPE_OUTPUT_STREAM, GOutputStream), NULL, &_inner_error_);
+ g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
_g_object_unref0 (outstream);
#line 8939 "Dialogs.c"
- goto __catch421_g_error;
+ goto __catch423_g_error;
}
#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
_g_object_unref0 (outstream);
#line 8944 "Dialogs.c"
}
- goto __finally421;
- __catch421_g_error:
+ goto __finally423;
+ __catch423_g_error:
{
GError* err = NULL;
GFile* _tmp23_ = NULL;
@@ -8988,7 +8988,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
_g_error_free0 (err);
#line 8975 "Dialogs.c"
}
- __finally421:
+ __finally423:
#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9973,19 +9973,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 9976 "Dialogs.c"
}
@@ -9995,17 +9995,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 9996 "Dialogs.c"
}
@@ -10018,33 +10018,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
gunichar _tmp1_ = 0U;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 10021 "Dialogs.c"
gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10029 "Dialogs.c"
} else {
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
-#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10035 "Dialogs.c"
}
@@ -10309,37 +10309,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 10310 "Dialogs.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10318 "Dialogs.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10330 "Dialogs.c"
}
@@ -10359,112 +10359,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 10354 "Dialogs.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 10360 "Dialogs.c"
} else {
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 10364 "Dialogs.c"
}
-#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 10368 "Dialogs.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 10380 "Dialogs.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 10390 "Dialogs.c"
}
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 10396 "Dialogs.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 10410 "Dialogs.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 10420 "Dialogs.c"
}
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 10426 "Dialogs.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 10435 "Dialogs.c"
}
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 10455 "Dialogs.c"
}
@@ -13585,13 +13585,13 @@ static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (
static void g_time_local (time_t time, struct tm* result) {
struct tm _result_ = {0};
struct tm _tmp0_ = {0};
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
localtime_r (&time, &_tmp0_);
-#line 2701 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result = _result_;
-#line 2702 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return;
#line 13582 "Dialogs.c"
}
@@ -14259,7 +14259,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 14247 "Dialogs.c"
- goto __catch422_g_error;
+ goto __catch424_g_error;
}
#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp116_ = _tmp113_;
@@ -14273,8 +14273,8 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
_g_object_unref0 (_tmp113_);
#line 14260 "Dialogs.c"
}
- goto __finally422;
- __catch422_g_error:
+ goto __finally424;
+ __catch424_g_error:
{
GError* err = NULL;
Dateable* _tmp117_ = NULL;
@@ -14298,7 +14298,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
_g_error_free0 (err);
#line 14285 "Dialogs.c"
}
- __finally422:
+ __finally424:
#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14681,35 +14681,35 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
+#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
#line 14700 "Dialogs.c"
}
@@ -17580,7 +17580,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 17566 "Dialogs.c"
- goto __catch423_g_error;
+ goto __catch425_g_error;
}
#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp8_ = syspics_child_enum;
@@ -17593,7 +17593,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
_g_object_unref0 (syspics_child_enum);
#line 17579 "Dialogs.c"
- goto __catch423_g_error;
+ goto __catch425_g_error;
}
#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp10_ = _tmp7_;
@@ -17617,8 +17617,8 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
return result;
#line 17602 "Dialogs.c"
}
- goto __finally423;
- __catch423_g_error:
+ goto __finally425;
+ __catch425_g_error:
{
GError* e = NULL;
#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17635,7 +17635,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
return result;
#line 17620 "Dialogs.c"
}
- __finally423:
+ __finally425:
#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
_g_object_unref0 (system_pictures);
#line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18527,11 +18527,11 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
#line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 18513 "Dialogs.c"
- goto __catch424_g_error;
+ goto __catch426_g_error;
}
}
- goto __finally424;
- __catch424_g_error:
+ goto __finally426;
+ __catch426_g_error:
{
GError* e = NULL;
GError* _tmp3_ = NULL;
@@ -18550,7 +18550,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
_g_error_free0 (e);
#line 18535 "Dialogs.c"
}
- __finally424:
+ __finally426:
#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18685,7 +18685,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
- _tmp17_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
+ _tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
combo_store = _tmp17_;
#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18791,7 +18791,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 18777 "Dialogs.c"
- goto __catch425_g_error;
+ goto __catch427_g_error;
}
#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp37_ = combo_store;
@@ -18800,7 +18800,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
- g_value_init (&_tmp40_, GDK_TYPE_PIXBUF);
+ g_value_init (&_tmp40_, gdk_pixbuf_get_type ());
#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
g_value_take_object (&_tmp40_, _tmp39_);
#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18843,7 +18843,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 18829 "Dialogs.c"
- goto __catch425_g_error;
+ goto __catch427_g_error;
}
#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp48_ = combo_store;
@@ -18852,7 +18852,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
_tmp50_ = icon_pixbuf;
#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
- g_value_init (&_tmp51_, GDK_TYPE_PIXBUF);
+ g_value_init (&_tmp51_, gdk_pixbuf_get_type ());
#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
g_value_set_object (&_tmp51_, _tmp50_);
#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18865,8 +18865,8 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
}
}
}
- goto __finally425;
- __catch425_g_error:
+ goto __finally427;
+ __catch427_g_error:
{
GError* _error_ = NULL;
GError* _tmp52_ = NULL;
@@ -18893,7 +18893,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
_g_error_free0 (_error_);
#line 18878 "Dialogs.c"
}
- __finally425:
+ __finally427:
#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"