diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-19 05:08:19 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-19 05:08:19 +0200 |
| commit | b076314018e4b53d745823754a26eb6fb73a2801 (patch) | |
| tree | a834cd64830068f988fda00b25578578ee096363 /plugins | |
| parent | b67c4ba420286470899a63ff8b2fbbfdc17d082c (diff) | |
New upstream version 0.24.1upstream/0.24.1
Diffstat (limited to 'plugins')
43 files changed, 3191 insertions, 3175 deletions
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c index fe85fe6..ea543cb 100644 --- a/plugins/common/RESTSupport.c +++ b/plugins/common/RESTSupport.c @@ -1,4 +1,4 @@ -/* RESTSupport.c generated by valac 0.32.1, the Vala compiler +/* RESTSupport.c generated by valac 0.34.1, the Vala compiler * generated from RESTSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -743,39 +743,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 774 "RESTSupport.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 780 "RESTSupport.c" } @@ -4744,19 +4744,19 @@ static gchar* string_chug (const gchar* self) { gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1199 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1200 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1201 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1201 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strchug (_tmp1_); -#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1202 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 4761 "RESTSupport.c" } @@ -4767,19 +4767,19 @@ static gchar* string_chomp (const gchar* self) { gchar* _result_ = NULL; gchar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 1191 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1191 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1192 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1192 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1193 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1193 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strchomp (_tmp1_); -#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1194 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 4784 "RESTSupport.c" } @@ -6224,15 +6224,15 @@ static gunichar string_get_char (const gchar* self, glong index) { gunichar result = 0U; glong _tmp0_ = 0L; gunichar _tmp1_ = 0U; -#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0U); -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_); -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6237 "RESTSupport.c" } @@ -8376,35 +8376,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 8376 "RESTSupport.c" gchar* _tmp4_ = NULL; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 8384 "RESTSupport.c" } else { -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 8390 "RESTSupport.c" } @@ -8418,37 +8418,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 8414 "RESTSupport.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 8422 "RESTSupport.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 8434 "RESTSupport.c" } @@ -8468,112 +8468,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 8458 "RESTSupport.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 8464 "RESTSupport.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 8468 "RESTSupport.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 8472 "RESTSupport.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 8484 "RESTSupport.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 8494 "RESTSupport.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 8500 "RESTSupport.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 8514 "RESTSupport.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 8524 "RESTSupport.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 8530 "RESTSupport.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 8539 "RESTSupport.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 8559 "RESTSupport.c" } diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c index dc7428b..5ff91d7 100644 --- a/plugins/common/Resources.c +++ b/plugins/common/Resources.c @@ -1,4 +1,4 @@ -/* Resources.c generated by valac 0.32.1, the Vala compiler +/* Resources.c generated by valac 0.34.1, the Vala compiler * generated from Resources.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c index 31d70a7..8db5f91 100644 --- a/plugins/shotwell-data-imports/FSpotDatabase.c +++ b/plugins/shotwell-data-imports/FSpotDatabase.c @@ -1,4 +1,4 @@ -/* FSpotDatabase.c generated by valac 0.32.1, the Vala compiler +/* FSpotDatabase.c generated by valac 0.34.1, the Vala compiler * generated from FSpotDatabase.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c index b20f73f..8217032 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseBehavior.c generated by valac 0.32.1, the Vala compiler +/* FSpotDatabaseBehavior.c generated by valac 0.34.1, the Vala compiler * generated from FSpotDatabaseBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c index 48e5030..fd4644e 100644 --- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c +++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c @@ -1,4 +1,4 @@ -/* FSpotDatabaseTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotDatabaseTable.c generated by valac 0.34.1, the Vala compiler * generated from FSpotDatabaseTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -211,72 +211,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 221 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 231 "FSpotDatabaseTable.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 241 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 247 "FSpotDatabaseTable.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 258 "FSpotDatabaseTable.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 270 "FSpotDatabaseTable.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 274 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 278 "FSpotDatabaseTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 282 "FSpotDatabaseTable.c" gint i = 0; @@ -299,16 +299,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 305 "FSpotDatabaseTable.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 314 "FSpotDatabaseTable.c" gboolean _tmp11_ = FALSE; @@ -321,97 +321,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 327 "FSpotDatabaseTable.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 333 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 343 "FSpotDatabaseTable.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 355 "FSpotDatabaseTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 359 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 365 "FSpotDatabaseTable.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 376 "FSpotDatabaseTable.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 391 "FSpotDatabaseTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 395 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 399 "FSpotDatabaseTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 405 "FSpotDatabaseTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 417 "FSpotDatabaseTable.c" gchar** _tmp25_ = NULL; @@ -420,91 +420,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 438 "FSpotDatabaseTable.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 442 "FSpotDatabaseTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 448 "FSpotDatabaseTable.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 455 "FSpotDatabaseTable.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 463 "FSpotDatabaseTable.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 501 "FSpotDatabaseTable.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 510 "FSpotDatabaseTable.c" gint _tmp48_ = 0; @@ -520,94 +520,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 526 "FSpotDatabaseTable.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 532 "FSpotDatabaseTable.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 546 "FSpotDatabaseTable.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 566 "FSpotDatabaseTable.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 581 "FSpotDatabaseTable.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 585 "FSpotDatabaseTable.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 593 "FSpotDatabaseTable.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 604 "FSpotDatabaseTable.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 613 "FSpotDatabaseTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c index 5cb73d5..5edf5b6 100644 --- a/plugins/shotwell-data-imports/FSpotImporter.c +++ b/plugins/shotwell-data-imports/FSpotImporter.c @@ -1,4 +1,4 @@ -/* FSpotImporter.c generated by valac 0.32.1, the Vala compiler +/* FSpotImporter.c generated by valac 0.34.1, the Vala compiler * generated from FSpotImporter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -1661,33 +1661,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 1665 "FSpotImporter.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1673 "FSpotImporter.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1679 "FSpotImporter.c" } @@ -1711,103 +1711,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 1713 "FSpotImporter.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 1722 "FSpotImporter.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 1728 "FSpotImporter.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 1737 "FSpotImporter.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 1743 "FSpotImporter.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 1752 "FSpotImporter.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 1756 "FSpotImporter.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 1764 "FSpotImporter.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 1773 "FSpotImporter.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 1777 "FSpotImporter.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1799 "FSpotImporter.c" } @@ -1817,15 +1817,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 1817 "FSpotImporter.c" } @@ -1838,37 +1838,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 1840 "FSpotImporter.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 1848 "FSpotImporter.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 1860 "FSpotImporter.c" } @@ -1888,112 +1888,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 1884 "FSpotImporter.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 1890 "FSpotImporter.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 1894 "FSpotImporter.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 1898 "FSpotImporter.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 1910 "FSpotImporter.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 1920 "FSpotImporter.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 1926 "FSpotImporter.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 1940 "FSpotImporter.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 1950 "FSpotImporter.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 1956 "FSpotImporter.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 1965 "FSpotImporter.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 1985 "FSpotImporter.c" } diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c index 5b8a0c1..94fd7c5 100644 --- a/plugins/shotwell-data-imports/FSpotMetaTable.c +++ b/plugins/shotwell-data-imports/FSpotMetaTable.c @@ -1,4 +1,4 @@ -/* FSpotMetaTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotMetaTable.c generated by valac 0.34.1, the Vala compiler * generated from FSpotMetaTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -302,72 +302,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 312 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 322 "FSpotMetaTable.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 332 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 338 "FSpotMetaTable.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 349 "FSpotMetaTable.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 361 "FSpotMetaTable.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 365 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 369 "FSpotMetaTable.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 373 "FSpotMetaTable.c" gint i = 0; @@ -390,16 +390,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 396 "FSpotMetaTable.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 405 "FSpotMetaTable.c" gboolean _tmp11_ = FALSE; @@ -412,97 +412,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 418 "FSpotMetaTable.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 424 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 434 "FSpotMetaTable.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 446 "FSpotMetaTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 450 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 456 "FSpotMetaTable.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 467 "FSpotMetaTable.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 482 "FSpotMetaTable.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 486 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 490 "FSpotMetaTable.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 496 "FSpotMetaTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 508 "FSpotMetaTable.c" gchar** _tmp25_ = NULL; @@ -511,91 +511,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 529 "FSpotMetaTable.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 533 "FSpotMetaTable.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 539 "FSpotMetaTable.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 546 "FSpotMetaTable.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 554 "FSpotMetaTable.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 592 "FSpotMetaTable.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 601 "FSpotMetaTable.c" gint _tmp48_ = 0; @@ -611,94 +611,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 617 "FSpotMetaTable.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 623 "FSpotMetaTable.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 637 "FSpotMetaTable.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 657 "FSpotMetaTable.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 672 "FSpotMetaTable.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 676 "FSpotMetaTable.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 684 "FSpotMetaTable.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 695 "FSpotMetaTable.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 704 "FSpotMetaTable.c" } @@ -1113,15 +1113,15 @@ static gint64 int64_parse (const gchar* str) { gint64 result = 0LL; const gchar* _tmp0_ = NULL; gint64 _tmp1_ = 0LL; -#line 679 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (str != NULL, 0LL); -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0); -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 680 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 1127 "FSpotMetaTable.c" } diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c index 27aca60..773290c 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoTagsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotPhotoTagsTable.c generated by valac 0.34.1, the Vala compiler * generated from FSpotPhotoTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c index 92b63eb..554c956 100644 --- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotoVersionsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotPhotoVersionsTable.c generated by valac 0.34.1, the Vala compiler * generated from FSpotPhotoVersionsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c index b610d4f..20cb92a 100644 --- a/plugins/shotwell-data-imports/FSpotPhotosTable.c +++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c @@ -1,4 +1,4 @@ -/* FSpotPhotosTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotPhotosTable.c generated by valac 0.34.1, the Vala compiler * generated from FSpotPhotosTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c index 2814b00..a4c521b 100644 --- a/plugins/shotwell-data-imports/FSpotRollsTable.c +++ b/plugins/shotwell-data-imports/FSpotRollsTable.c @@ -1,4 +1,4 @@ -/* FSpotRollsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotRollsTable.c generated by valac 0.34.1, the Vala compiler * generated from FSpotRollsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c index 77543b8..a4866ce 100644 --- a/plugins/shotwell-data-imports/FSpotTableBehavior.c +++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c @@ -1,4 +1,4 @@ -/* FSpotTableBehavior.c generated by valac 0.32.1, the Vala compiler +/* FSpotTableBehavior.c generated by valac 0.34.1, the Vala compiler * generated from FSpotTableBehavior.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c index 93805e4..32a4f94 100644 --- a/plugins/shotwell-data-imports/FSpotTagsTable.c +++ b/plugins/shotwell-data-imports/FSpotTagsTable.c @@ -1,4 +1,4 @@ -/* FSpotTagsTable.c generated by valac 0.32.1, the Vala compiler +/* FSpotTagsTable.c generated by valac 0.34.1, the Vala compiler * generated from FSpotTagsTable.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c index 4abfac9..a5c9f31 100644 --- a/plugins/shotwell-data-imports/SqliteSupport.c +++ b/plugins/shotwell-data-imports/SqliteSupport.c @@ -1,4 +1,4 @@ -/* SqliteSupport.c generated by valac 0.32.1, the Vala compiler +/* SqliteSupport.c generated by valac 0.34.1, the Vala compiler * generated from SqliteSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c index dec3778..46de879 100644 --- a/plugins/shotwell-data-imports/VersionNumber.c +++ b/plugins/shotwell-data-imports/VersionNumber.c @@ -1,4 +1,4 @@ -/* VersionNumber.c generated by valac 0.32.1, the Vala compiler +/* VersionNumber.c generated by valac 0.34.1, the Vala compiler * generated from VersionNumber.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -246,72 +246,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 256 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 266 "VersionNumber.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 276 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 282 "VersionNumber.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 293 "VersionNumber.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 305 "VersionNumber.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 309 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 313 "VersionNumber.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 317 "VersionNumber.c" gint i = 0; @@ -334,16 +334,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 340 "VersionNumber.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 349 "VersionNumber.c" gboolean _tmp11_ = FALSE; @@ -356,97 +356,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 362 "VersionNumber.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 368 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 378 "VersionNumber.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 390 "VersionNumber.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 394 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 400 "VersionNumber.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 411 "VersionNumber.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 426 "VersionNumber.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 430 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 434 "VersionNumber.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 440 "VersionNumber.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 452 "VersionNumber.c" gchar** _tmp25_ = NULL; @@ -455,91 +455,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 473 "VersionNumber.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 477 "VersionNumber.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 483 "VersionNumber.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 490 "VersionNumber.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 498 "VersionNumber.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 536 "VersionNumber.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 545 "VersionNumber.c" gint _tmp48_ = 0; @@ -555,94 +555,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 561 "VersionNumber.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 567 "VersionNumber.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 581 "VersionNumber.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 601 "VersionNumber.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 616 "VersionNumber.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 620 "VersionNumber.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 628 "VersionNumber.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 639 "VersionNumber.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 648 "VersionNumber.c" } diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c index 0c8ea43..6bc819c 100644 --- a/plugins/shotwell-data-imports/shotwell-data-imports.c +++ b/plugins/shotwell-data-imports/shotwell-data-imports.c @@ -1,4 +1,4 @@ -/* shotwell-data-imports.c generated by valac 0.32.1, the Vala compiler +/* shotwell-data-imports.c generated by valac 0.34.1, the Vala compiler * generated from shotwell-data-imports.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h index a50ee95..f0e19f5 100644 --- a/plugins/shotwell-plugin-common.h +++ b/plugins/shotwell-plugin-common.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.h generated by valac 0.32.1, the Vala compiler, do not modify */ +/* shotwell-plugin-common.h generated by valac 0.34.1, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_COMMON_H__ diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi index 39d0cdd..8b1a0e1 100644 --- a/plugins/shotwell-plugin-common.vapi +++ b/plugins/shotwell-plugin-common.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-common.vapi generated by valac 0.32.1, do not modify. */ +/* shotwell-plugin-common.vapi generated by valac 0.34.1, do not modify. */ namespace Publishing { namespace RESTSupport { diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h index fb72125..1fc97db 100644 --- a/plugins/shotwell-plugin-dev-1.0.h +++ b/plugins/shotwell-plugin-dev-1.0.h @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.h generated by valac 0.32.1, the Vala compiler, do not modify */ +/* shotwell-plugin-dev-1.0.h generated by valac 0.34.1, the Vala compiler, do not modify */ #ifndef __PLUGINS_SHOTWELL_PLUGIN_DEV_1_0_H__ diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi index e065dab..3af85d1 100644 --- a/plugins/shotwell-plugin-dev-1.0.vapi +++ b/plugins/shotwell-plugin-dev-1.0.vapi @@ -1,4 +1,4 @@ -/* shotwell-plugin-dev-1.0.vapi generated by valac 0.32.1, do not modify. */ +/* shotwell-plugin-dev-1.0.vapi generated by valac 0.34.1, do not modify. */ namespace Spit { namespace DataImports { diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c index bf0174a..716b48e 100644 --- a/plugins/shotwell-publishing-extras/GalleryConnector.c +++ b/plugins/shotwell-publishing-extras/GalleryConnector.c @@ -1,4 +1,4 @@ -/* GalleryConnector.c generated by valac 0.32.1, the Vala compiler +/* GalleryConnector.c generated by valac 0.34.1, the Vala compiler * generated from GalleryConnector.vala, do not modify */ /* Copyright 2012-2013 Joe Sapp nixphoeni@gentoo.org @@ -2105,15 +2105,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 2088 "GalleryConnector.c" } @@ -2499,103 +2499,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 2484 "GalleryConnector.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 2493 "GalleryConnector.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 2499 "GalleryConnector.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 2508 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 2514 "GalleryConnector.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 2523 "GalleryConnector.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 2527 "GalleryConnector.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 2535 "GalleryConnector.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 2544 "GalleryConnector.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 2548 "GalleryConnector.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2570 "GalleryConnector.c" } @@ -3099,72 +3099,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 3078 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 3088 "GalleryConnector.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 3098 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 3104 "GalleryConnector.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 3115 "GalleryConnector.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 3127 "GalleryConnector.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 3131 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 3135 "GalleryConnector.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 3139 "GalleryConnector.c" gint i = 0; @@ -3187,16 +3187,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 3162 "GalleryConnector.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 3171 "GalleryConnector.c" gboolean _tmp11_ = FALSE; @@ -3209,97 +3209,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 3184 "GalleryConnector.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 3190 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 3200 "GalleryConnector.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 3212 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 3216 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 3222 "GalleryConnector.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 3233 "GalleryConnector.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 3248 "GalleryConnector.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 3252 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 3256 "GalleryConnector.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 3262 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 3274 "GalleryConnector.c" gchar** _tmp25_ = NULL; @@ -3308,91 +3308,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 3295 "GalleryConnector.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 3299 "GalleryConnector.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 3305 "GalleryConnector.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 3312 "GalleryConnector.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3320 "GalleryConnector.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 3358 "GalleryConnector.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 3367 "GalleryConnector.c" gint _tmp48_ = 0; @@ -3408,94 +3408,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 3383 "GalleryConnector.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 3389 "GalleryConnector.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 3403 "GalleryConnector.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 3423 "GalleryConnector.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 3438 "GalleryConnector.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 3442 "GalleryConnector.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 3450 "GalleryConnector.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3461 "GalleryConnector.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3470 "GalleryConnector.c" } @@ -3839,11 +3839,11 @@ static void _vala_array_add4 (PublishingGallery3Album*** array, int* length, int static const gchar* string_to_string (const gchar* self) { const gchar* result = NULL; -#line 1412 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = self; -#line 1413 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3818 "GalleryConnector.c" } @@ -9928,19 +9928,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 9905 "GalleryConnector.c" } @@ -10047,37 +10047,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 10022 "GalleryConnector.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 10030 "GalleryConnector.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 10042 "GalleryConnector.c" } @@ -10097,112 +10097,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 10066 "GalleryConnector.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 10072 "GalleryConnector.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 10076 "GalleryConnector.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 10080 "GalleryConnector.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 10092 "GalleryConnector.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 10102 "GalleryConnector.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 10108 "GalleryConnector.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 10122 "GalleryConnector.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 10132 "GalleryConnector.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 10138 "GalleryConnector.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 10147 "GalleryConnector.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 10167 "GalleryConnector.c" } @@ -10763,25 +10763,25 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar _tmp3_ = '\0'; -#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = delimiters; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = new_delimiter; -#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _result_; -#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 10746 "GalleryConnector.c" } @@ -12896,35 +12896,35 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 12873 "GalleryConnector.c" gchar* _tmp4_ = NULL; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12881 "GalleryConnector.c" } else { -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12887 "GalleryConnector.c" } diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c index 3653b1b..9ede44f 100644 --- a/plugins/shotwell-publishing-extras/RajcePublishing.c +++ b/plugins/shotwell-publishing-extras/RajcePublishing.c @@ -1,4 +1,4 @@ -/* RajcePublishing.c generated by valac 0.32.1, the Vala compiler +/* RajcePublishing.c generated by valac 0.34.1, the Vala compiler * generated from RajcePublishing.vala, do not modify */ /* Copyright 2014 rajce.net @@ -7756,19 +7756,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 7770 "RajcePublishing.c" } diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c index 5a6498a..71b6574 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.c +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c @@ -1,4 +1,4 @@ -/* TumblrPublishing.c generated by valac 0.32.1, the Vala compiler +/* TumblrPublishing.c generated by valac 0.34.1, the Vala compiler * generated from TumblrPublishing.vala, do not modify */ /* Copyright 2012 BJA Electronics @@ -2797,11 +2797,11 @@ static gpointer _json_object_ref0 (gpointer self) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 2801 "TumblrPublishing.c" { @@ -2816,73 +2816,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 2832 "TumblrPublishing.c" goto __catch35_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 2841 "TumblrPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 2857 "TumblrPublishing.c" goto __catch35_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 2868 "TumblrPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2882 "TumblrPublishing.c" } @@ -2890,24 +2890,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* __catch35_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 2896 "TumblrPublishing.c" } __finally35: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 2907 "TumblrPublishing.c" } @@ -6081,39 +6081,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 6095 "TumblrPublishing.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 6101 "TumblrPublishing.c" } @@ -6126,72 +6126,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 6118 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 6128 "TumblrPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 6138 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 6144 "TumblrPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 6155 "TumblrPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 6167 "TumblrPublishing.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 6171 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 6175 "TumblrPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 6179 "TumblrPublishing.c" gint i = 0; @@ -6214,16 +6214,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 6202 "TumblrPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 6211 "TumblrPublishing.c" gboolean _tmp11_ = FALSE; @@ -6236,97 +6236,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 6224 "TumblrPublishing.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 6230 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 6240 "TumblrPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 6252 "TumblrPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 6256 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 6262 "TumblrPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 6273 "TumblrPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 6288 "TumblrPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 6292 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 6296 "TumblrPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 6302 "TumblrPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 6314 "TumblrPublishing.c" gchar** _tmp25_ = NULL; @@ -6335,91 +6335,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 6335 "TumblrPublishing.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 6339 "TumblrPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 6345 "TumblrPublishing.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 6352 "TumblrPublishing.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6360 "TumblrPublishing.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 6398 "TumblrPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 6407 "TumblrPublishing.c" gint _tmp48_ = 0; @@ -6435,94 +6435,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 6423 "TumblrPublishing.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 6429 "TumblrPublishing.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 6443 "TumblrPublishing.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 6463 "TumblrPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 6478 "TumblrPublishing.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 6482 "TumblrPublishing.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 6490 "TumblrPublishing.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6501 "TumblrPublishing.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 6510 "TumblrPublishing.c" } @@ -8022,37 +8022,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 8017 "TumblrPublishing.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 8025 "TumblrPublishing.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 8037 "TumblrPublishing.c" } @@ -8072,112 +8072,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 8061 "TumblrPublishing.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 8067 "TumblrPublishing.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 8071 "TumblrPublishing.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 8075 "TumblrPublishing.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 8087 "TumblrPublishing.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 8097 "TumblrPublishing.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 8103 "TumblrPublishing.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 8117 "TumblrPublishing.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 8127 "TumblrPublishing.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 8133 "TumblrPublishing.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 8142 "TumblrPublishing.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 8162 "TumblrPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c index 35dac7f..d13a33b 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.c +++ b/plugins/shotwell-publishing-extras/YandexPublishing.c @@ -1,4 +1,4 @@ -/* YandexPublishing.c generated by valac 0.32.1, the Vala compiler +/* YandexPublishing.c generated by valac 0.34.1, the Vala compiler * generated from YandexPublishing.vala, do not modify */ /* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net> @@ -2522,24 +2522,24 @@ GType publishing_yandex_uploader_get_type (void) { static gchar* bool_to_string (gboolean self) { gchar* result = NULL; -#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (self) { #line 2528 "YandexPublishing.c" gchar* _tmp0_ = NULL; -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp0_; -#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2536 "YandexPublishing.c" } else { gchar* _tmp1_ = NULL; -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_strdup ("false"); -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp1_; -#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 2545 "YandexPublishing.c" } @@ -2565,39 +2565,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 2597 "YandexPublishing.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 2603 "YandexPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c index 53262a3..4b6ea4b 100644 --- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c +++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c @@ -1,4 +1,4 @@ -/* shotwell-publishing-extras.c generated by valac 0.32.1, the Vala compiler +/* shotwell-publishing-extras.c generated by valac 0.34.1, the Vala compiler * generated from shotwell-publishing-extras.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c index e3cccd3..eaf143c 100644 --- a/plugins/shotwell-publishing/FacebookPublishing.c +++ b/plugins/shotwell-publishing/FacebookPublishing.c @@ -1,4 +1,4 @@ -/* FacebookPublishing.c generated by valac 0.32.1, the Vala compiler +/* FacebookPublishing.c generated by valac 0.34.1, the Vala compiler * generated from FacebookPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3476,35 +3476,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 3481 "FacebookPublishing.c" gchar* _tmp4_ = NULL; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3489 "FacebookPublishing.c" } else { -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3495 "FacebookPublishing.c" } @@ -3528,103 +3528,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) { glong _tmp19_ = 0L; glong _tmp20_ = 0L; gchar* _tmp21_ = NULL; -#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 3529 "FacebookPublishing.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 3538 "FacebookPublishing.c" } -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 3544 "FacebookPublishing.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 3553 "FacebookPublishing.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 3559 "FacebookPublishing.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 3568 "FacebookPublishing.c" } else { -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 3572 "FacebookPublishing.c" } -#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp8_, NULL); -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13_ >= ((glong) 0)) { #line 3580 "FacebookPublishing.c" glong _tmp14_ = 0L; glong _tmp15_ = 0L; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ <= _tmp15_; #line 3589 "FacebookPublishing.c" } else { -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 3593 "FacebookPublishing.c" } -#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = start; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = end; -#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_)); -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp21_; -#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3615 "FacebookPublishing.c" } @@ -3637,33 +3637,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_); -#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 3640 "FacebookPublishing.c" gchar* _tmp4_ = NULL; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3648 "FacebookPublishing.c" } else { -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = -1; -#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3654 "FacebookPublishing.c" } @@ -3673,11 +3673,11 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 3668 "FacebookPublishing.c" { @@ -3692,73 +3692,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 3699 "FacebookPublishing.c" goto __catch4_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 3708 "FacebookPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 3724 "FacebookPublishing.c" goto __catch4_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 3735 "FacebookPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 3749 "FacebookPublishing.c" } @@ -3766,24 +3766,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* __catch4_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 3763 "FacebookPublishing.c" } __finally4: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 3774 "FacebookPublishing.c" } @@ -5471,17 +5471,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 5453 "FacebookPublishing.c" } @@ -10191,13 +10191,13 @@ static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_ static gchar* g_date_time_to_string (GDateTime* self) { gchar* result = NULL; gchar* _tmp0_ = NULL; -#line 2785 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2834 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_date_time_format (self, "%FT%H:%M:%S%z"); -#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp0_; -#line 2786 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 10167 "FacebookPublishing.c" } diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c index b4d74aa..3bada95 100644 --- a/plugins/shotwell-publishing/FlickrPublishing.c +++ b/plugins/shotwell-publishing/FlickrPublishing.c @@ -1,4 +1,4 @@ -/* FlickrPublishing.c generated by valac 0.32.1, the Vala compiler +/* FlickrPublishing.c generated by valac 0.34.1, the Vala compiler * generated from FlickrPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -211,7 +211,6 @@ typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate Publishing typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry PublishingFlickrPublishingOptionsPaneParamSpecSizeEntry; typedef struct _PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry PublishingFlickrPublishingOptionsPaneParamSpecVisibilityEntry; typedef struct _PublishingFlickrUploaderPrivate PublishingFlickrUploaderPrivate; -#define _gexiv2_metadata_free0(var) ((var == NULL) ? NULL : (var = (gexiv2_metadata_free (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -793,7 +792,7 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire _tmp0__length1 = flickr_service_icon_pixbuf_set_length1; #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 791 "FlickrPublishing.c" +#line 790 "FlickrPublishing.c" gint _tmp1_ = 0; GdkPixbuf** _tmp2_ = NULL; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -806,18 +805,18 @@ FlickrService* flickr_service_construct (GType object_type, GFile* resource_dire flickr_service_icon_pixbuf_set_length1 = _tmp1_; #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _flickr_service_icon_pixbuf_set_size_ = flickr_service_icon_pixbuf_set_length1; -#line 804 "FlickrPublishing.c" +#line 803 "FlickrPublishing.c" } #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 808 "FlickrPublishing.c" +#line 807 "FlickrPublishing.c" } FlickrService* flickr_service_new (GFile* resource_directory) { #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return flickr_service_construct (TYPE_FLICKR_SERVICE, resource_directory); -#line 815 "FlickrPublishing.c" +#line 814 "FlickrPublishing.c" } @@ -839,7 +838,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi result = _tmp2_; #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 837 "FlickrPublishing.c" +#line 836 "FlickrPublishing.c" } @@ -852,7 +851,7 @@ static const gchar* flickr_service_real_get_id (SpitPluggable* base) { result = "org.yorba.shotwell.publishing.flickr"; #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 850 "FlickrPublishing.c" +#line 849 "FlickrPublishing.c" } @@ -865,14 +864,14 @@ static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base) result = "Flickr"; #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 863 "FlickrPublishing.c" +#line 862 "FlickrPublishing.c" } static gpointer _g_object_ref0 (gpointer self) { #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_object_ref (self) : NULL; -#line 870 "FlickrPublishing.c" +#line 869 "FlickrPublishing.c" } @@ -883,17 +882,17 @@ static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) { result = g_new0 (GdkPixbuf*, length + 1); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (i = 0; i < length; i++) { -#line 881 "FlickrPublishing.c" +#line 880 "FlickrPublishing.c" GdkPixbuf* _tmp0_ = NULL; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _g_object_ref0 (self[i]); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result[i] = _tmp0_; -#line 887 "FlickrPublishing.c" +#line 886 "FlickrPublishing.c" } #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 891 "FlickrPublishing.c" +#line 890 "FlickrPublishing.c" } @@ -975,7 +974,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo (*info).icons = _tmp9_; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*info).icons_length1 = _tmp9__length1; -#line 973 "FlickrPublishing.c" +#line 972 "FlickrPublishing.c" } @@ -983,7 +982,7 @@ static void flickr_service_real_activation (SpitPluggable* base, gboolean enable FlickrService * self; #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FLICKR_SERVICE, FlickrService); -#line 981 "FlickrPublishing.c" +#line 980 "FlickrPublishing.c" } @@ -1004,7 +1003,7 @@ static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublis result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher); #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1002 "FlickrPublishing.c" +#line 1001 "FlickrPublishing.c" } @@ -1017,7 +1016,7 @@ static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO; #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1015 "FlickrPublishing.c" +#line 1014 "FlickrPublishing.c" } @@ -1026,7 +1025,7 @@ static void flickr_service_class_init (FlickrServiceClass * klass) { flickr_service_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = flickr_service_finalize; -#line 1024 "FlickrPublishing.c" +#line 1023 "FlickrPublishing.c" } @@ -1043,7 +1042,7 @@ static void flickr_service_spit_pluggable_interface_init (SpitPluggableIface * i iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) flickr_service_real_get_info; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->activation = (void (*)(SpitPluggable*, gboolean)) flickr_service_real_activation; -#line 1041 "FlickrPublishing.c" +#line 1040 "FlickrPublishing.c" } @@ -1054,7 +1053,7 @@ static void flickr_service_spit_publishing_service_interface_init (SpitPublishin iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) flickr_service_real_create_publisher; #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) flickr_service_real_get_supported_media; -#line 1052 "FlickrPublishing.c" +#line 1051 "FlickrPublishing.c" } @@ -1068,7 +1067,7 @@ static void flickr_service_finalize (GObject* obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FLICKR_SERVICE, FlickrService); #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (flickr_service_parent_class)->finalize (obj); -#line 1066 "FlickrPublishing.c" +#line 1065 "FlickrPublishing.c" } @@ -1121,21 +1120,21 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat self->everyone_level = _tmp2_; #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1119 "FlickrPublishing.c" +#line 1118 "FlickrPublishing.c" } PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) { #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_visibility_specification_construct (PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, friends_level, family_level, everyone_level); -#line 1126 "FlickrPublishing.c" +#line 1125 "FlickrPublishing.c" } static void publishing_flickr_value_visibility_specification_init (GValue* value) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1133 "FlickrPublishing.c" +#line 1132 "FlickrPublishing.c" } @@ -1144,7 +1143,7 @@ static void publishing_flickr_value_visibility_specification_free_value (GValue* if (value->data[0].v_pointer) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (value->data[0].v_pointer); -#line 1142 "FlickrPublishing.c" +#line 1141 "FlickrPublishing.c" } } @@ -1154,11 +1153,11 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G if (src_value->data[0].v_pointer) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (src_value->data[0].v_pointer); -#line 1152 "FlickrPublishing.c" +#line 1151 "FlickrPublishing.c" } else { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1156 "FlickrPublishing.c" +#line 1155 "FlickrPublishing.c" } } @@ -1166,37 +1165,37 @@ static void publishing_flickr_value_visibility_specification_copy_value (const G static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1164 "FlickrPublishing.c" +#line 1163 "FlickrPublishing.c" } static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1171 "FlickrPublishing.c" +#line 1170 "FlickrPublishing.c" PublishingFlickrVisibilitySpecification* object; object = collect_values[0].v_pointer; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1178 "FlickrPublishing.c" +#line 1177 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1182 "FlickrPublishing.c" +#line 1181 "FlickrPublishing.c" } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object); -#line 1186 "FlickrPublishing.c" +#line 1185 "FlickrPublishing.c" } else { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1190 "FlickrPublishing.c" +#line 1189 "FlickrPublishing.c" } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1194 "FlickrPublishing.c" +#line 1193 "FlickrPublishing.c" } @@ -1207,25 +1206,25 @@ static gchar* publishing_flickr_value_visibility_specification_lcopy_value (cons if (!object_p) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1205 "FlickrPublishing.c" +#line 1204 "FlickrPublishing.c" } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 1211 "FlickrPublishing.c" +#line 1210 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1215 "FlickrPublishing.c" +#line 1214 "FlickrPublishing.c" } else { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1219 "FlickrPublishing.c" +#line 1218 "FlickrPublishing.c" } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1223 "FlickrPublishing.c" +#line 1222 "FlickrPublishing.c" } @@ -1239,7 +1238,7 @@ GParamSpec* publishing_flickr_param_spec_visibility_specification (const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1237 "FlickrPublishing.c" +#line 1236 "FlickrPublishing.c" } @@ -1248,7 +1247,7 @@ gpointer publishing_flickr_value_get_visibility_specification (const GValue* val g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION), NULL); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1246 "FlickrPublishing.c" +#line 1245 "FlickrPublishing.c" } @@ -1268,17 +1267,17 @@ void publishing_flickr_value_set_visibility_specification (GValue* value, gpoint value->data[0].v_pointer = v_object; #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_ref (value->data[0].v_pointer); -#line 1266 "FlickrPublishing.c" +#line 1265 "FlickrPublishing.c" } else { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1270 "FlickrPublishing.c" +#line 1269 "FlickrPublishing.c" } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1276 "FlickrPublishing.c" +#line 1275 "FlickrPublishing.c" } } @@ -1297,17 +1296,17 @@ void publishing_flickr_value_take_visibility_specification (GValue* value, gpoin g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1295 "FlickrPublishing.c" +#line 1294 "FlickrPublishing.c" } else { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1299 "FlickrPublishing.c" +#line 1298 "FlickrPublishing.c" } #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_visibility_specification_unref (old); -#line 1305 "FlickrPublishing.c" +#line 1304 "FlickrPublishing.c" } } @@ -1317,14 +1316,14 @@ static void publishing_flickr_visibility_specification_class_init (PublishingFli publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize; -#line 1315 "FlickrPublishing.c" +#line 1314 "FlickrPublishing.c" } static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) { #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1322 "FlickrPublishing.c" +#line 1321 "FlickrPublishing.c" } @@ -1334,7 +1333,7 @@ static void publishing_flickr_visibility_specification_finalize (PublishingFlick self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_destroy (self); -#line 1332 "FlickrPublishing.c" +#line 1331 "FlickrPublishing.c" } @@ -1359,7 +1358,7 @@ gpointer publishing_flickr_visibility_specification_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 1357 "FlickrPublishing.c" +#line 1356 "FlickrPublishing.c" } @@ -1372,7 +1371,7 @@ void publishing_flickr_visibility_specification_unref (gpointer instance) { PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self); #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1370 "FlickrPublishing.c" +#line 1369 "FlickrPublishing.c" } } @@ -1383,21 +1382,21 @@ PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_co self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type); #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1381 "FlickrPublishing.c" +#line 1380 "FlickrPublishing.c" } PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) { #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS); -#line 1388 "FlickrPublishing.c" +#line 1387 "FlickrPublishing.c" } static void publishing_flickr_value_publishing_parameters_init (GValue* value) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1395 "FlickrPublishing.c" +#line 1394 "FlickrPublishing.c" } @@ -1406,7 +1405,7 @@ static void publishing_flickr_value_publishing_parameters_free_value (GValue* va if (value->data[0].v_pointer) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer); -#line 1404 "FlickrPublishing.c" +#line 1403 "FlickrPublishing.c" } } @@ -1416,11 +1415,11 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal if (src_value->data[0].v_pointer) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 1414 "FlickrPublishing.c" +#line 1413 "FlickrPublishing.c" } else { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1418 "FlickrPublishing.c" +#line 1417 "FlickrPublishing.c" } } @@ -1428,37 +1427,37 @@ static void publishing_flickr_value_publishing_parameters_copy_value (const GVal static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1426 "FlickrPublishing.c" +#line 1425 "FlickrPublishing.c" } static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 1433 "FlickrPublishing.c" +#line 1432 "FlickrPublishing.c" PublishingFlickrPublishingParameters* object; object = collect_values[0].v_pointer; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1440 "FlickrPublishing.c" +#line 1439 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1444 "FlickrPublishing.c" +#line 1443 "FlickrPublishing.c" } #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object); -#line 1448 "FlickrPublishing.c" +#line 1447 "FlickrPublishing.c" } else { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1452 "FlickrPublishing.c" +#line 1451 "FlickrPublishing.c" } #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1456 "FlickrPublishing.c" +#line 1455 "FlickrPublishing.c" } @@ -1469,25 +1468,25 @@ static gchar* publishing_flickr_value_publishing_parameters_lcopy_value (const G if (!object_p) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1467 "FlickrPublishing.c" +#line 1466 "FlickrPublishing.c" } #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 1473 "FlickrPublishing.c" +#line 1472 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 1477 "FlickrPublishing.c" +#line 1476 "FlickrPublishing.c" } else { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1481 "FlickrPublishing.c" +#line 1480 "FlickrPublishing.c" } #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 1485 "FlickrPublishing.c" +#line 1484 "FlickrPublishing.c" } @@ -1501,7 +1500,7 @@ GParamSpec* publishing_flickr_param_spec_publishing_parameters (const gchar* nam G_PARAM_SPEC (spec)->value_type = object_type; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 1499 "FlickrPublishing.c" +#line 1498 "FlickrPublishing.c" } @@ -1510,7 +1509,7 @@ gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS), NULL); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 1508 "FlickrPublishing.c" +#line 1507 "FlickrPublishing.c" } @@ -1530,17 +1529,17 @@ void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer value->data[0].v_pointer = v_object; #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer); -#line 1528 "FlickrPublishing.c" +#line 1527 "FlickrPublishing.c" } else { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1532 "FlickrPublishing.c" +#line 1531 "FlickrPublishing.c" } #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1538 "FlickrPublishing.c" +#line 1537 "FlickrPublishing.c" } } @@ -1559,17 +1558,17 @@ void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 1557 "FlickrPublishing.c" +#line 1556 "FlickrPublishing.c" } else { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 1561 "FlickrPublishing.c" +#line 1560 "FlickrPublishing.c" } #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_parameters_unref (old); -#line 1567 "FlickrPublishing.c" +#line 1566 "FlickrPublishing.c" } } @@ -1579,14 +1578,14 @@ static void publishing_flickr_publishing_parameters_class_init (PublishingFlickr publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize; -#line 1577 "FlickrPublishing.c" +#line 1576 "FlickrPublishing.c" } static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) { #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 1584 "FlickrPublishing.c" +#line 1583 "FlickrPublishing.c" } @@ -1600,7 +1599,7 @@ static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPu _g_free0 (self->username); #line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_visibility_specification_unref0 (self->visibility_specification); -#line 1598 "FlickrPublishing.c" +#line 1597 "FlickrPublishing.c" } @@ -1625,7 +1624,7 @@ gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 1623 "FlickrPublishing.c" +#line 1622 "FlickrPublishing.c" } @@ -1638,7 +1637,7 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) { PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1636 "FlickrPublishing.c" +#line 1635 "FlickrPublishing.c" } } @@ -1646,7 +1645,7 @@ void publishing_flickr_publishing_parameters_unref (gpointer instance) { static void _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) { #line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self); -#line 1644 "FlickrPublishing.c" +#line 1643 "FlickrPublishing.c" } @@ -1701,14 +1700,14 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0); #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 1699 "FlickrPublishing.c" +#line 1698 "FlickrPublishing.c" } PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) { #line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host); -#line 1706 "FlickrPublishing.c" +#line 1705 "FlickrPublishing.c" } @@ -1721,7 +1720,7 @@ static void publishing_flickr_flickr_publisher_invalidate_persistent_session (Pu publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (self, ""); #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_access_phase_username (self, ""); -#line 1719 "FlickrPublishing.c" +#line 1718 "FlickrPublishing.c" } @@ -1744,7 +1743,7 @@ static gboolean publishing_flickr_flickr_publisher_is_persistent_session_valid ( _g_free0 (_tmp3_); #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp4_) { -#line 1742 "FlickrPublishing.c" +#line 1741 "FlickrPublishing.c" gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1755,15 +1754,15 @@ static gboolean publishing_flickr_flickr_publisher_is_persistent_session_valid ( _tmp1_ = _tmp6_ != NULL; #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp6_); -#line 1753 "FlickrPublishing.c" +#line 1752 "FlickrPublishing.c" } else { #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; -#line 1757 "FlickrPublishing.c" +#line 1756 "FlickrPublishing.c" } #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 1761 "FlickrPublishing.c" +#line 1760 "FlickrPublishing.c" gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -1774,17 +1773,17 @@ static gboolean publishing_flickr_flickr_publisher_is_persistent_session_valid ( _tmp0_ = _tmp8_ != NULL; #line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp8_); -#line 1772 "FlickrPublishing.c" +#line 1771 "FlickrPublishing.c" } else { #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = FALSE; -#line 1776 "FlickrPublishing.c" +#line 1775 "FlickrPublishing.c" } #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp0_; #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1782 "FlickrPublishing.c" +#line 1781 "FlickrPublishing.c" } @@ -1802,7 +1801,7 @@ static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_use result = _tmp1_; #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1800 "FlickrPublishing.c" +#line 1799 "FlickrPublishing.c" } @@ -1819,7 +1818,7 @@ static void publishing_flickr_flickr_publisher_set_persistent_access_phase_usern _tmp1_ = username; #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_); -#line 1817 "FlickrPublishing.c" +#line 1816 "FlickrPublishing.c" } @@ -1837,7 +1836,7 @@ static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_tok result = _tmp1_; #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1835 "FlickrPublishing.c" +#line 1834 "FlickrPublishing.c" } @@ -1854,7 +1853,7 @@ static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token _tmp1_ = token; #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_); -#line 1852 "FlickrPublishing.c" +#line 1851 "FlickrPublishing.c" } @@ -1872,7 +1871,7 @@ static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_tok result = _tmp1_; #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1870 "FlickrPublishing.c" +#line 1869 "FlickrPublishing.c" } @@ -1889,7 +1888,7 @@ static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token _tmp1_ = secret; #line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_); -#line 1887 "FlickrPublishing.c" +#line 1886 "FlickrPublishing.c" } @@ -1907,7 +1906,7 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata result = _tmp1_; #line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 1905 "FlickrPublishing.c" +#line 1904 "FlickrPublishing.c" } @@ -1922,7 +1921,7 @@ static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (Pu _tmp1_ = strip_metadata; #line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_); -#line 1920 "FlickrPublishing.c" +#line 1919 "FlickrPublishing.c" } @@ -1936,28 +1935,28 @@ static void publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked (Pu if (!_tmp0_) { #line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1934 "FlickrPublishing.c" +#line 1933 "FlickrPublishing.c" } #line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:173: EVENT: user clicked 'Login' button in the w" \ "elcome pane"); #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_run_authentication_request_transaction (self); -#line 1940 "FlickrPublishing.c" +#line 1939 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_auth_request_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender); -#line 1947 "FlickrPublishing.c" +#line 1946 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_auth_request_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 1954 "FlickrPublishing.c" +#line 1953 "FlickrPublishing.c" } @@ -1995,7 +1994,7 @@ static void publishing_flickr_flickr_publisher_on_auth_request_txn_completed (Pu if (!_tmp4_) { #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 1992 "FlickrPublishing.c" +#line 1991 "FlickrPublishing.c" } #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = txn; @@ -2018,7 +2017,7 @@ static void publishing_flickr_flickr_publisher_on_auth_request_txn_completed (Pu publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_request (self, _tmp10_); #line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp10_); -#line 2014 "FlickrPublishing.c" +#line 2013 "FlickrPublishing.c" } @@ -2052,7 +2051,7 @@ static void publishing_flickr_flickr_publisher_on_auth_request_txn_error (Publis if (!_tmp4_) { #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2048 "FlickrPublishing.c" +#line 2047 "FlickrPublishing.c" } #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:199: EVENT: OAuth authentication request transac" \ @@ -2063,7 +2062,7 @@ static void publishing_flickr_flickr_publisher_on_auth_request_txn_error (Publis _tmp6_ = err; #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); -#line 2058 "FlickrPublishing.c" +#line 2057 "FlickrPublishing.c" } @@ -2099,7 +2098,7 @@ static void publishing_flickr_flickr_publisher_on_authentication_token_available _tmp5_ = token; #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_launch_system_browser (self, _tmp5_); -#line 2093 "FlickrPublishing.c" +#line 2092 "FlickrPublishing.c" } @@ -2113,20 +2112,20 @@ static void publishing_flickr_flickr_publisher_on_system_browser_launched (Publi if (!_tmp0_) { #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2107 "FlickrPublishing.c" +#line 2106 "FlickrPublishing.c" } #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:216: EVENT: system browser launched."); #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_pin_entry_pane (self); -#line 2113 "FlickrPublishing.c" +#line 2112 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed (PublishingFlickrPinEntryPane* _sender, PublishingFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self) { #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_pin_entry_proceed ((PublishingFlickrFlickrPublisher*) self, sender, authorization_pin); -#line 2120 "FlickrPublishing.c" +#line 2119 "FlickrPublishing.c" } @@ -2153,7 +2152,7 @@ static void publishing_flickr_flickr_publisher_on_pin_entry_proceed (PublishingF if (!_tmp2_) { #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2147 "FlickrPublishing.c" +#line 2146 "FlickrPublishing.c" } #line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:227: EVENT: user clicked 'Continue' in PIN entry" \ @@ -2162,21 +2161,21 @@ static void publishing_flickr_flickr_publisher_on_pin_entry_proceed (PublishingF _tmp3_ = pin; #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_verify_pin (self, _tmp3_); -#line 2155 "FlickrPublishing.c" +#line 2154 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender); -#line 2162 "FlickrPublishing.c" +#line 2161 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_access_token_fetch_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 2169 "FlickrPublishing.c" +#line 2168 "FlickrPublishing.c" } @@ -2211,7 +2210,7 @@ static void publishing_flickr_flickr_publisher_on_access_token_fetch_txn_complet if (!_tmp4_) { #line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2204 "FlickrPublishing.c" +#line 2203 "FlickrPublishing.c" } #line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:239: EVENT: fetching OAuth access token over the" \ @@ -2226,7 +2225,7 @@ static void publishing_flickr_flickr_publisher_on_access_token_fetch_txn_complet publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (self, _tmp7_); #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 2218 "FlickrPublishing.c" +#line 2217 "FlickrPublishing.c" } @@ -2260,7 +2259,7 @@ static void publishing_flickr_flickr_publisher_on_access_token_fetch_error (Publ if (!_tmp4_) { #line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2252 "FlickrPublishing.c" +#line 2251 "FlickrPublishing.c" } #line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:252: EVENT: fetching OAuth access token over the" \ @@ -2271,7 +2270,7 @@ static void publishing_flickr_flickr_publisher_on_access_token_fetch_error (Publ _tmp6_ = err; #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); -#line 2262 "FlickrPublishing.c" +#line 2261 "FlickrPublishing.c" } @@ -2297,7 +2296,7 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish if (!_tmp0_) { #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2288 "FlickrPublishing.c" +#line 2287 "FlickrPublishing.c" } #line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:261: EVENT: a fully authenticated session has be" \ @@ -2344,21 +2343,21 @@ static void publishing_flickr_flickr_publisher_on_session_authenticated (Publish _g_free0 (_tmp12_); #line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_fetch_account_info (self); -#line 2334 "FlickrPublishing.c" +#line 2333 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender); -#line 2341 "FlickrPublishing.c" +#line 2340 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 2348 "FlickrPublishing.c" +#line 2347 "FlickrPublishing.c" } @@ -2393,7 +2392,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P if (!_tmp4_) { #line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2383 "FlickrPublishing.c" +#line 2382 "FlickrPublishing.c" } #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:279: EVENT: account fetch transaction response r" \ @@ -2408,7 +2407,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_); #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp7_); -#line 2397 "FlickrPublishing.c" +#line 2396 "FlickrPublishing.c" } @@ -2442,7 +2441,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi if (!_tmp4_) { #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2431 "FlickrPublishing.c" +#line 2430 "FlickrPublishing.c" } #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:291: EVENT: account fetch transaction caused a n" \ @@ -2453,7 +2452,7 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi _tmp6_ = err; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); -#line 2441 "FlickrPublishing.c" +#line 2440 "FlickrPublishing.c" } @@ -2467,28 +2466,28 @@ static void publishing_flickr_flickr_publisher_on_account_info_available (Publis if (!_tmp0_) { #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2455 "FlickrPublishing.c" +#line 2454 "FlickrPublishing.c" } #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:299: EVENT: account information has become avail" \ "able"); #line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self); -#line 2461 "FlickrPublishing.c" +#line 2460 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) { #line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_publishing_options_pane_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata); -#line 2468 "FlickrPublishing.c" +#line 2467 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) { #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self); -#line 2475 "FlickrPublishing.c" +#line 2474 "FlickrPublishing.c" } @@ -2519,7 +2518,7 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis if (!_tmp4_) { #line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2506 "FlickrPublishing.c" +#line 2505 "FlickrPublishing.c" } #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:310: EVENT: user clicked the 'Publish' button in" \ @@ -2528,7 +2527,7 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis _tmp5_ = strip_metadata; #line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_publish (self, _tmp5_); -#line 2514 "FlickrPublishing.c" +#line 2513 "FlickrPublishing.c" } @@ -2558,14 +2557,14 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout if (!_tmp4_) { #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2544 "FlickrPublishing.c" +#line 2543 "FlickrPublishing.c" } #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:321: EVENT: user clicked the 'Logout' button in " \ "the publishing options pane"); #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_logout (self); -#line 2550 "FlickrPublishing.c" +#line 2549 "FlickrPublishing.c" } @@ -2586,7 +2585,7 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish if (!_tmp0_) { #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2571 "FlickrPublishing.c" +#line 2570 "FlickrPublishing.c" } #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = completed_fraction; @@ -2609,21 +2608,21 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish _tmp5_ = completed_fraction; #line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 2593 "FlickrPublishing.c" +#line 2592 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published); -#line 2600 "FlickrPublishing.c" +#line 2599 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err); -#line 2607 "FlickrPublishing.c" +#line 2606 "FlickrPublishing.c" } @@ -2644,7 +2643,7 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli if (!_tmp0_) { #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2628 "FlickrPublishing.c" +#line 2627 "FlickrPublishing.c" } #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = num_published; @@ -2665,7 +2664,7 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_flickr_flickr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_success_pane (self); -#line 2648 "FlickrPublishing.c" +#line 2647 "FlickrPublishing.c" } @@ -2689,7 +2688,7 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr if (!_tmp0_) { #line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2672 "FlickrPublishing.c" +#line 2671 "FlickrPublishing.c" } #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = err; @@ -2716,14 +2715,14 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr _tmp8_ = err; #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 2698 "FlickrPublishing.c" +#line 2697 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) { #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked ((PublishingFlickrFlickrPublisher*) self); -#line 2705 "FlickrPublishing.c" +#line 2704 "FlickrPublishing.c" } @@ -2742,7 +2741,7 @@ static void publishing_flickr_flickr_publisher_do_show_login_welcome_pane (Publi _tmp1_ = self->priv->host; #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_welcome_pane (_tmp1_, PUBLISHING_FLICKR_SERVICE_WELCOME_MESSAGE, _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback, self); -#line 2724 "FlickrPublishing.c" +#line 2723 "FlickrPublishing.c" } @@ -2779,7 +2778,7 @@ static void publishing_flickr_flickr_publisher_do_run_authentication_request_tra g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 2760 "FlickrPublishing.c" +#line 2759 "FlickrPublishing.c" { #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2787,7 +2786,7 @@ static void publishing_flickr_flickr_publisher_do_run_authentication_request_tra if (G_UNLIKELY (_inner_error_ != NULL)) { #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2768 "FlickrPublishing.c" +#line 2767 "FlickrPublishing.c" goto __catch16_spit_publishing_publishing_error; } #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2798,7 +2797,7 @@ static void publishing_flickr_flickr_publisher_do_run_authentication_request_tra g_clear_error (&_inner_error_); #line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2779 "FlickrPublishing.c" +#line 2778 "FlickrPublishing.c" } } goto __finally16; @@ -2819,7 +2818,7 @@ static void publishing_flickr_flickr_publisher_do_run_authentication_request_tra spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_); #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 2800 "FlickrPublishing.c" +#line 2799 "FlickrPublishing.c" } __finally16: #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -2832,11 +2831,11 @@ static void publishing_flickr_flickr_publisher_do_run_authentication_request_tra g_clear_error (&_inner_error_); #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 2813 "FlickrPublishing.c" +#line 2812 "FlickrPublishing.c" } #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2817 "FlickrPublishing.c" +#line 2816 "FlickrPublishing.c" } @@ -2883,7 +2882,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req _tmp4_ = key_value_pairs; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4__length1 = key_value_pairs_length1; -#line 2863 "FlickrPublishing.c" +#line 2862 "FlickrPublishing.c" { gchar** pair_collection = NULL; gint pair_collection_length1 = 0; @@ -2895,14 +2894,14 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req pair_collection_length1 = _tmp4__length1; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (pair_it = 0; pair_it < _tmp4__length1; pair_it = pair_it + 1) { -#line 2875 "FlickrPublishing.c" +#line 2874 "FlickrPublishing.c" gchar* _tmp5_ = NULL; gchar* pair = NULL; #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup (pair_collection[pair_it]); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" pair = _tmp5_; -#line 2882 "FlickrPublishing.c" +#line 2881 "FlickrPublishing.c" { gchar** split_pair = NULL; const gchar* _tmp6_ = NULL; @@ -2931,7 +2930,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req _tmp9__length1 = split_pair_length1; #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp9__length1 != 2) { -#line 2911 "FlickrPublishing.c" +#line 2910 "FlickrPublishing.c" SpitPublishingPluginHost* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; GError* _tmp12_ = NULL; @@ -2948,7 +2947,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_); #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (_tmp13_); -#line 2928 "FlickrPublishing.c" +#line 2927 "FlickrPublishing.c" } #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = split_pair; @@ -2958,7 +2957,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req _tmp15_ = _tmp14_[0]; #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp15_, "oauth_token") == 0) { -#line 2938 "FlickrPublishing.c" +#line 2937 "FlickrPublishing.c" gchar** _tmp16_ = NULL; gint _tmp16__length1 = 0; const gchar* _tmp17_ = NULL; @@ -2975,7 +2974,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req _g_free0 (oauth_token); #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" oauth_token = _tmp18_; -#line 2955 "FlickrPublishing.c" +#line 2954 "FlickrPublishing.c" } else { gchar** _tmp19_ = NULL; gint _tmp19__length1 = 0; @@ -2988,7 +2987,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req _tmp20_ = _tmp19_[0]; #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) { -#line 2968 "FlickrPublishing.c" +#line 2967 "FlickrPublishing.c" gchar** _tmp21_ = NULL; gint _tmp21__length1 = 0; const gchar* _tmp22_ = NULL; @@ -3005,14 +3004,14 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req _g_free0 (oauth_token_secret); #line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" oauth_token_secret = _tmp23_; -#line 2985 "FlickrPublishing.c" +#line 2984 "FlickrPublishing.c" } } #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL); #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (pair); -#line 2992 "FlickrPublishing.c" +#line 2991 "FlickrPublishing.c" } } } @@ -3022,18 +3021,18 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req if (_tmp25_ == NULL) { #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = TRUE; -#line 3002 "FlickrPublishing.c" +#line 3001 "FlickrPublishing.c" } else { const gchar* _tmp26_ = NULL; #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp26_ = oauth_token_secret; #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = _tmp26_ == NULL; -#line 3009 "FlickrPublishing.c" +#line 3008 "FlickrPublishing.c" } #line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp24_) { -#line 3013 "FlickrPublishing.c" +#line 3012 "FlickrPublishing.c" SpitPublishingPluginHost* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; GError* _tmp29_ = NULL; @@ -3050,7 +3049,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_); #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (_tmp30_); -#line 3030 "FlickrPublishing.c" +#line 3029 "FlickrPublishing.c" } #line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = oauth_token; @@ -3064,7 +3063,7 @@ static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_req _g_free0 (oauth_token_secret); #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (oauth_token); -#line 3044 "FlickrPublishing.c" +#line 3043 "FlickrPublishing.c" } @@ -3100,7 +3099,7 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish #line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:419: ACTION: launching system browser with uri =" \ " '%s'", _tmp5_); -#line 3079 "FlickrPublishing.c" +#line 3078 "FlickrPublishing.c" { const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; @@ -3119,7 +3118,7 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish if (G_UNLIKELY (_inner_error_ != NULL)) { #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == G_SPAWN_ERROR) { -#line 3098 "FlickrPublishing.c" +#line 3097 "FlickrPublishing.c" goto __catch17_g_spawn_error; } #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3130,7 +3129,7 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish g_clear_error (&_inner_error_); #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3109 "FlickrPublishing.c" +#line 3108 "FlickrPublishing.c" } } goto __finally17; @@ -3160,7 +3159,7 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish _g_free0 (login_uri); #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3139 "FlickrPublishing.c" +#line 3138 "FlickrPublishing.c" } __finally17: #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3173,13 +3172,13 @@ static void publishing_flickr_flickr_publisher_do_launch_system_browser (Publish g_clear_error (&_inner_error_); #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3152 "FlickrPublishing.c" +#line 3151 "FlickrPublishing.c" } #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_system_browser_launched (self); #line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (login_uri); -#line 3158 "FlickrPublishing.c" +#line 3157 "FlickrPublishing.c" } @@ -3201,7 +3200,7 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin _tmp0_ = gtk_builder_new (); #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" builder = _tmp0_; -#line 3180 "FlickrPublishing.c" +#line 3179 "FlickrPublishing.c" { GtkBuilder* _tmp1_ = NULL; #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3210,7 +3209,7 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_); #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3189 "FlickrPublishing.c" +#line 3188 "FlickrPublishing.c" goto __catch18_g_error; } } @@ -3253,7 +3252,7 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin _g_object_unref0 (builder); #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3231 "FlickrPublishing.c" +#line 3230 "FlickrPublishing.c" } __finally18: #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3266,7 +3265,7 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin g_clear_error (&_inner_error_); #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3244 "FlickrPublishing.c" +#line 3243 "FlickrPublishing.c" } #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = builder; @@ -3288,7 +3287,7 @@ static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (Publishin _g_object_unref0 (pin_entry_pane); #line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 3266 "FlickrPublishing.c" +#line 3265 "FlickrPublishing.c" } @@ -3332,7 +3331,7 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0); -#line 3310 "FlickrPublishing.c" +#line 3309 "FlickrPublishing.c" { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -3340,7 +3339,7 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl if (G_UNLIKELY (_inner_error_ != NULL)) { #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3318 "FlickrPublishing.c" +#line 3317 "FlickrPublishing.c" goto __catch19_spit_publishing_publishing_error; } #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3351,7 +3350,7 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl g_clear_error (&_inner_error_); #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3329 "FlickrPublishing.c" +#line 3328 "FlickrPublishing.c" } } goto __finally19; @@ -3372,7 +3371,7 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 3350 "FlickrPublishing.c" +#line 3349 "FlickrPublishing.c" } __finally19: #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3385,11 +3384,11 @@ static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFl g_clear_error (&_inner_error_); #line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3363 "FlickrPublishing.c" +#line 3362 "FlickrPublishing.c" } #line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 3367 "FlickrPublishing.c" +#line 3366 "FlickrPublishing.c" } @@ -3445,7 +3444,7 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia _tmp4_ = key_value_pairs; #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4__length1 = key_value_pairs_length1; -#line 3422 "FlickrPublishing.c" +#line 3421 "FlickrPublishing.c" { gchar** key_value_pair_collection = NULL; gint key_value_pair_collection_length1 = 0; @@ -3457,14 +3456,14 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia key_value_pair_collection_length1 = _tmp4__length1; #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (key_value_pair_it = 0; key_value_pair_it < _tmp4__length1; key_value_pair_it = key_value_pair_it + 1) { -#line 3434 "FlickrPublishing.c" +#line 3433 "FlickrPublishing.c" gchar* _tmp5_ = NULL; gchar* key_value_pair = NULL; #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup (key_value_pair_collection[key_value_pair_it]); #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" key_value_pair = _tmp5_; -#line 3441 "FlickrPublishing.c" +#line 3440 "FlickrPublishing.c" { gchar** split_pair = NULL; const gchar* _tmp6_ = NULL; @@ -3507,7 +3506,7 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia _g_free0 (key_value_pair); #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" continue; -#line 3484 "FlickrPublishing.c" +#line 3483 "FlickrPublishing.c" } #line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = split_pair; @@ -3533,7 +3532,7 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia _tmp16_ = key; #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp16_, "oauth_token") == 0) { -#line 3510 "FlickrPublishing.c" +#line 3509 "FlickrPublishing.c" const gchar* _tmp17_ = NULL; gchar* _tmp18_ = NULL; #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3544,14 +3543,14 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia _g_free0 (token); #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" token = _tmp18_; -#line 3521 "FlickrPublishing.c" +#line 3520 "FlickrPublishing.c" } else { const gchar* _tmp19_ = NULL; #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp19_ = key; #line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp19_, "oauth_token_secret") == 0) { -#line 3528 "FlickrPublishing.c" +#line 3527 "FlickrPublishing.c" const gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3562,14 +3561,14 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia _g_free0 (token_secret); #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" token_secret = _tmp21_; -#line 3539 "FlickrPublishing.c" +#line 3538 "FlickrPublishing.c" } else { const gchar* _tmp22_ = NULL; #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp22_ = key; #line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (g_strcmp0 (_tmp22_, "username") == 0) { -#line 3546 "FlickrPublishing.c" +#line 3545 "FlickrPublishing.c" const gchar* _tmp23_ = NULL; gchar* _tmp24_ = NULL; #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3580,7 +3579,7 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia _g_free0 (username); #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" username = _tmp24_; -#line 3557 "FlickrPublishing.c" +#line 3556 "FlickrPublishing.c" } } } @@ -3592,7 +3591,7 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL); #line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (key_value_pair); -#line 3569 "FlickrPublishing.c" +#line 3568 "FlickrPublishing.c" } } } @@ -3611,31 +3610,31 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia if (_tmp30_ == NULL) { #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = TRUE; -#line 3587 "FlickrPublishing.c" +#line 3586 "FlickrPublishing.c" } else { const gchar* _tmp31_ = NULL; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp31_ = token_secret; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp29_ = _tmp31_ == NULL; -#line 3594 "FlickrPublishing.c" +#line 3593 "FlickrPublishing.c" } #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp29_) { #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = TRUE; -#line 3600 "FlickrPublishing.c" +#line 3599 "FlickrPublishing.c" } else { const gchar* _tmp32_ = NULL; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = username; #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = _tmp32_ == NULL; -#line 3607 "FlickrPublishing.c" +#line 3606 "FlickrPublishing.c" } #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp28_) { -#line 3611 "FlickrPublishing.c" +#line 3610 "FlickrPublishing.c" SpitPublishingPluginHost* _tmp33_ = NULL; GError* _tmp34_ = NULL; GError* _tmp35_ = NULL; @@ -3650,7 +3649,7 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia spit_publishing_plugin_host_post_error (_tmp33_, _tmp35_); #line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (_tmp35_); -#line 3625 "FlickrPublishing.c" +#line 3624 "FlickrPublishing.c" } #line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = self->priv->session; @@ -3670,7 +3669,7 @@ static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentia _g_free0 (token); #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL); -#line 3645 "FlickrPublishing.c" +#line 3644 "FlickrPublishing.c" } @@ -3704,7 +3703,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 3678 "FlickrPublishing.c" +#line 3677 "FlickrPublishing.c" { #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -3712,7 +3711,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing if (G_UNLIKELY (_inner_error_ != NULL)) { #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3686 "FlickrPublishing.c" +#line 3685 "FlickrPublishing.c" goto __catch20_spit_publishing_publishing_error; } #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3723,7 +3722,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_clear_error (&_inner_error_); #line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3697 "FlickrPublishing.c" +#line 3696 "FlickrPublishing.c" } } goto __finally20; @@ -3744,7 +3743,7 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_); #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 3718 "FlickrPublishing.c" +#line 3717 "FlickrPublishing.c" } __finally20: #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3757,11 +3756,11 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing g_clear_error (&_inner_error_); #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3731 "FlickrPublishing.c" +#line 3730 "FlickrPublishing.c" } #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 3735 "FlickrPublishing.c" +#line 3734 "FlickrPublishing.c" } @@ -3777,7 +3776,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:524: ACTION: parsing account information from xm" \ "l = '%s'", _tmp0_); -#line 3750 "FlickrPublishing.c" +#line 3749 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* response_doc = NULL; const gchar* _tmp1_ = NULL; @@ -3820,7 +3819,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P if (G_UNLIKELY (_inner_error_ != NULL)) { #line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3793 "FlickrPublishing.c" +#line 3792 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } #line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3829,7 +3828,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3802 "FlickrPublishing.c" +#line 3801 "FlickrPublishing.c" } #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = response_doc; @@ -3851,7 +3850,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3824 "FlickrPublishing.c" +#line 3823 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3862,7 +3861,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3835 "FlickrPublishing.c" +#line 3834 "FlickrPublishing.c" } #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_ = response_doc; @@ -3878,7 +3877,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3851 "FlickrPublishing.c" +#line 3850 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3889,7 +3888,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3862 "FlickrPublishing.c" +#line 3861 "FlickrPublishing.c" } #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp11_ = response_doc; @@ -3907,7 +3906,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3880 "FlickrPublishing.c" +#line 3879 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3920,7 +3919,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3893 "FlickrPublishing.c" +#line 3892 "FlickrPublishing.c" } #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = response_doc; @@ -3938,7 +3937,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3911 "FlickrPublishing.c" +#line 3910 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3951,7 +3950,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3924 "FlickrPublishing.c" +#line 3923 "FlickrPublishing.c" } #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp17_ = is_pro_str; @@ -3959,7 +3958,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P if (g_strcmp0 (_tmp17_, "0") == 0) { #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_FREE; -#line 3932 "FlickrPublishing.c" +#line 3931 "FlickrPublishing.c" } else { const gchar* _tmp18_ = NULL; #line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3968,7 +3967,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P if (g_strcmp0 (_tmp18_, "1") == 0) { #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" user_kind = PUBLISHING_FLICKR_USER_KIND_PRO; -#line 3941 "FlickrPublishing.c" +#line 3940 "FlickrPublishing.c" } else { GError* _tmp19_ = NULL; #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3983,7 +3982,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _publishing_rest_support_xml_document_unref0 (response_doc); #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 3956 "FlickrPublishing.c" +#line 3955 "FlickrPublishing.c" goto __catch21_spit_publishing_publishing_error; } #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -3998,7 +3997,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 3971 "FlickrPublishing.c" +#line 3970 "FlickrPublishing.c" } } #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4025,7 +4024,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_free0 (is_pro_str); #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (response_doc); -#line 3998 "FlickrPublishing.c" +#line 3997 "FlickrPublishing.c" } goto __finally21; __catch21_spit_publishing_publishing_error: @@ -4048,7 +4047,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_error_free0 (err); #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4021 "FlickrPublishing.c" +#line 4020 "FlickrPublishing.c" } #line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp27_ = self->priv->host; @@ -4060,7 +4059,7 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P _g_error_free0 (err); #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4033 "FlickrPublishing.c" +#line 4032 "FlickrPublishing.c" } __finally21: #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4071,11 +4070,11 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P g_clear_error (&_inner_error_); #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4044 "FlickrPublishing.c" +#line 4043 "FlickrPublishing.c" } #line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_account_info_available (self); -#line 4048 "FlickrPublishing.c" +#line 4047 "FlickrPublishing.c" } @@ -4096,7 +4095,7 @@ static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickr self->priv->running = FALSE; #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 4068 "FlickrPublishing.c" +#line 4067 "FlickrPublishing.c" } @@ -4127,7 +4126,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( _tmp1_ = gtk_builder_new (); #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" builder = _tmp1_; -#line 4099 "FlickrPublishing.c" +#line 4098 "FlickrPublishing.c" { GtkBuilder* _tmp2_ = NULL; #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4136,7 +4135,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "flickr_publishing_options_pane.ui", &_inner_error_); #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4108 "FlickrPublishing.c" +#line 4107 "FlickrPublishing.c" goto __catch22_g_error; } } @@ -4179,7 +4178,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( _g_object_unref0 (builder); #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4150 "FlickrPublishing.c" +#line 4149 "FlickrPublishing.c" } __finally22: #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -4192,7 +4191,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( g_clear_error (&_inner_error_); #line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4163 "FlickrPublishing.c" +#line 4162 "FlickrPublishing.c" } #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp9_ = self->priv->parameters; @@ -4226,7 +4225,7 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane ( spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (builder); -#line 4197 "FlickrPublishing.c" +#line 4196 "FlickrPublishing.c" } @@ -4268,7 +4267,7 @@ gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPubli result = _tmp7_; #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4239 "FlickrPublishing.c" +#line 4238 "FlickrPublishing.c" } @@ -4277,14 +4276,14 @@ static gint _publishing_flickr_flickr_publisher_flickr_date_time_compare_func_gc result = publishing_flickr_flickr_publisher_flickr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4248 "FlickrPublishing.c" +#line 4247 "FlickrPublishing.c" } static void _publishing_flickr_flickr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete); -#line 4255 "FlickrPublishing.c" +#line 4254 "FlickrPublishing.c" } @@ -4367,7 +4366,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick if (!_tmp9_) { #line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4337 "FlickrPublishing.c" +#line 4336 "FlickrPublishing.c" } #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp10_ = self->priv->host; @@ -4387,7 +4386,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick _tmp14_ = publishables; #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14__length1 = publishables_length1; -#line 4357 "FlickrPublishing.c" +#line 4356 "FlickrPublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; @@ -4399,14 +4398,14 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick p_collection_length1 = _tmp14__length1; #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) { -#line 4369 "FlickrPublishing.c" +#line 4368 "FlickrPublishing.c" SpitPublishingPublishable* _tmp15_ = NULL; SpitPublishingPublishable* p = NULL; #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15_ = _g_object_ref0 (p_collection[p_it]); #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" p = _tmp15_; -#line 4376 "FlickrPublishing.c" +#line 4375 "FlickrPublishing.c" { GeeArrayList* _tmp16_ = NULL; SpitPublishingPublishable* _tmp17_ = NULL; @@ -4418,7 +4417,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (p); -#line 4388 "FlickrPublishing.c" +#line 4387 "FlickrPublishing.c" } } } @@ -4466,7 +4465,7 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick _g_object_unref0 (sorted_list); #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 4436 "FlickrPublishing.c" +#line 4435 "FlickrPublishing.c" } @@ -4485,7 +4484,7 @@ static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingF _tmp1_ = self->priv->host; #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 4455 "FlickrPublishing.c" +#line 4454 "FlickrPublishing.c" } @@ -4503,7 +4502,7 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli result = _tmp1_; #line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4473 "FlickrPublishing.c" +#line 4472 "FlickrPublishing.c" } @@ -4518,7 +4517,7 @@ void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFli _tmp1_ = vis; #line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "visibility", _tmp1_); -#line 4488 "FlickrPublishing.c" +#line 4487 "FlickrPublishing.c" } @@ -4536,7 +4535,7 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF result = _tmp1_; #line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4506 "FlickrPublishing.c" +#line 4505 "FlickrPublishing.c" } @@ -4551,7 +4550,7 @@ void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingF _tmp1_ = size; #line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_); -#line 4521 "FlickrPublishing.c" +#line 4520 "FlickrPublishing.c" } @@ -4570,7 +4569,7 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic result = _tmp1_; #line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4540 "FlickrPublishing.c" +#line 4539 "FlickrPublishing.c" } @@ -4586,7 +4585,7 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi result = _tmp0_; #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4556 "FlickrPublishing.c" +#line 4555 "FlickrPublishing.c" } @@ -4602,7 +4601,7 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl _tmp0_ = publishing_flickr_flickr_publisher_is_persistent_session_valid (self); #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_) { -#line 4572 "FlickrPublishing.c" +#line 4571 "FlickrPublishing.c" PublishingFlickrSession* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; @@ -4635,14 +4634,14 @@ static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFl _g_free0 (_tmp5_); #line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp3_); -#line 4604 "FlickrPublishing.c" +#line 4603 "FlickrPublishing.c" } else { #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:682: attempt start: no persistent session availa" \ "ble; showing login welcome pane"); #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_do_show_login_welcome_pane (self); -#line 4610 "FlickrPublishing.c" +#line 4609 "FlickrPublishing.c" } } @@ -4659,7 +4658,7 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish if (_tmp0_) { #line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 4627 "FlickrPublishing.c" +#line 4626 "FlickrPublishing.c" } #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->was_started; @@ -4668,13 +4667,13 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_error ("FlickrPublishing.vala:693: FlickrPublisher: start( ): can't start; thi" \ "s publisher is not restartable."); -#line 4635 "FlickrPublishing.c" +#line 4634 "FlickrPublishing.c" } #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_debug ("FlickrPublishing.vala:695: FlickrPublisher: starting interaction."); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_attempt_start (self); -#line 4641 "FlickrPublishing.c" +#line 4640 "FlickrPublishing.c" } @@ -4689,17 +4688,17 @@ static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublishe _tmp0_ = self->priv->session; #line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ != NULL) { -#line 4656 "FlickrPublishing.c" +#line 4655 "FlickrPublishing.c" PublishingFlickrSession* _tmp1_ = NULL; #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = self->priv->session; #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 4662 "FlickrPublishing.c" +#line 4661 "FlickrPublishing.c" } #line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->running = FALSE; -#line 4666 "FlickrPublishing.c" +#line 4665 "FlickrPublishing.c" } @@ -4710,7 +4709,7 @@ static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlick g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate)); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize; -#line 4677 "FlickrPublishing.c" +#line 4676 "FlickrPublishing.c" } @@ -4725,7 +4724,7 @@ static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interfa iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start; #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop; -#line 4692 "FlickrPublishing.c" +#line 4691 "FlickrPublishing.c" } @@ -4744,7 +4743,7 @@ static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFl self->priv->publishing_options_pane = NULL; #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->parameters = NULL; -#line 4711 "FlickrPublishing.c" +#line 4710 "FlickrPublishing.c" } @@ -4780,7 +4779,7 @@ static void publishing_flickr_flickr_publisher_finalize (GObject* obj) { _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj); -#line 4747 "FlickrPublishing.c" +#line 4746 "FlickrPublishing.c" } @@ -4909,14 +4908,14 @@ PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_construct (GType publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (self); #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 4876 "FlickrPublishing.c" +#line 4875 "FlickrPublishing.c" } PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_new (GtkBuilder* builder) { #line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_pin_entry_pane_construct (PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, builder); -#line 4883 "FlickrPublishing.c" +#line 4882 "FlickrPublishing.c" } @@ -4931,7 +4930,7 @@ static void publishing_flickr_pin_entry_pane_on_continue_clicked (PublishingFlic _tmp1_ = gtk_entry_get_text (_tmp0_); #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "proceed", self, _tmp1_); -#line 4898 "FlickrPublishing.c" +#line 4897 "FlickrPublishing.c" } @@ -4952,7 +4951,7 @@ static void publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (Publ _tmp3_ = _tmp2_; #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0)); -#line 4919 "FlickrPublishing.c" +#line 4918 "FlickrPublishing.c" } @@ -4971,7 +4970,7 @@ static GtkWidget* publishing_flickr_pin_entry_pane_real_get_widget (SpitPublishi result = _tmp1_; #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4938 "FlickrPublishing.c" +#line 4937 "FlickrPublishing.c" } @@ -4984,21 +4983,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_flickr_pin_entry_pane_ result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 4951 "FlickrPublishing.c" +#line 4950 "FlickrPublishing.c" } static void _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_pin_entry_pane_on_continue_clicked ((PublishingFlickrPinEntryPane*) self); -#line 4958 "FlickrPublishing.c" +#line 4957 "FlickrPublishing.c" } static void _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingFlickrPinEntryPane*) self); -#line 4965 "FlickrPublishing.c" +#line 4964 "FlickrPublishing.c" } @@ -5016,7 +5015,7 @@ static void publishing_flickr_pin_entry_pane_real_on_pane_installed (SpitPublish _tmp1_ = self->priv->pin_entry; #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0); -#line 4983 "FlickrPublishing.c" +#line 4982 "FlickrPublishing.c" } @@ -5040,7 +5039,7 @@ static void publishing_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPubli g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE); #line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self); -#line 5007 "FlickrPublishing.c" +#line 5006 "FlickrPublishing.c" } @@ -5059,19 +5058,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_STRING (GClosure * closure, GVa data1 = closure->data; #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 5026 "FlickrPublishing.c" +#line 5025 "FlickrPublishing.c" } else { #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" data1 = param_values->data[0].v_pointer; #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" data2 = closure->data; -#line 5032 "FlickrPublishing.c" +#line 5031 "FlickrPublishing.c" } #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback); #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 5038 "FlickrPublishing.c" +#line 5037 "FlickrPublishing.c" } @@ -5084,7 +5083,7 @@ static void publishing_flickr_pin_entry_pane_class_init (PublishingFlickrPinEntr G_OBJECT_CLASS (klass)->finalize = publishing_flickr_pin_entry_pane_finalize; #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_new ("proceed", PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING); -#line 5051 "FlickrPublishing.c" +#line 5050 "FlickrPublishing.c" } @@ -5099,7 +5098,7 @@ static void publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_interfa iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_installed; #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_uninstalled; -#line 5066 "FlickrPublishing.c" +#line 5065 "FlickrPublishing.c" } @@ -5118,7 +5117,7 @@ static void publishing_flickr_pin_entry_pane_instance_init (PublishingFlickrPinE self->priv->explanatory_text = NULL; #line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->builder = NULL; -#line 5085 "FlickrPublishing.c" +#line 5084 "FlickrPublishing.c" } @@ -5140,7 +5139,7 @@ static void publishing_flickr_pin_entry_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->builder); #line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_pin_entry_pane_parent_class)->finalize (obj); -#line 5107 "FlickrPublishing.c" +#line 5106 "FlickrPublishing.c" } @@ -5206,14 +5205,14 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY); #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5173 "FlickrPublishing.c" +#line 5172 "FlickrPublishing.c" } PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) { #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method); -#line 5180 "FlickrPublishing.c" +#line 5179 "FlickrPublishing.c" } @@ -5270,14 +5269,14 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY); #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5237 "FlickrPublishing.c" +#line 5236 "FlickrPublishing.c" } PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { #line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_transaction_construct_with_uri (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, uri, method); -#line 5244 "FlickrPublishing.c" +#line 5243 "FlickrPublishing.c" } @@ -5306,7 +5305,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra g_propagate_error (error, _inner_error_); #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 5273 "FlickrPublishing.c" +#line 5272 "FlickrPublishing.c" } else { #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -5314,7 +5313,7 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra g_clear_error (&_inner_error_); #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 5281 "FlickrPublishing.c" +#line 5280 "FlickrPublishing.c" } } } @@ -5358,7 +5357,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _tmp4_ = status; #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp4_ == NULL) { -#line 5325 "FlickrPublishing.c" +#line 5324 "FlickrPublishing.c" gchar* _tmp5_ = NULL; #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = g_strdup ("No status property in root node"); @@ -5368,7 +5367,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5335 "FlickrPublishing.c" +#line 5334 "FlickrPublishing.c" } #line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp6_ = status; @@ -5380,7 +5379,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5347 "FlickrPublishing.c" +#line 5346 "FlickrPublishing.c" } { xmlNode* _tmp7_ = NULL; @@ -5399,7 +5398,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum if (G_UNLIKELY (_inner_error_ != NULL)) { #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5366 "FlickrPublishing.c" +#line 5365 "FlickrPublishing.c" goto __catch23_spit_publishing_publishing_error; } #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5410,11 +5409,11 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5377 "FlickrPublishing.c" +#line 5376 "FlickrPublishing.c" } #line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" errcode = _tmp7_; -#line 5381 "FlickrPublishing.c" +#line 5380 "FlickrPublishing.c" } goto __finally23; __catch23_spit_publishing_publishing_error: @@ -5435,7 +5434,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5402 "FlickrPublishing.c" +#line 5401 "FlickrPublishing.c" } __finally23: #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5448,7 +5447,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum g_clear_error (&_inner_error_); #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5415 "FlickrPublishing.c" +#line 5414 "FlickrPublishing.c" } #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp12_ = errcode; @@ -5476,7 +5475,7 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum _g_free0 (status); #line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5443 "FlickrPublishing.c" +#line 5442 "FlickrPublishing.c" } @@ -5485,7 +5484,7 @@ static gchar* _publishing_flickr_transaction_validate_xml_publishing_rest_suppor result = publishing_flickr_transaction_validate_xml (doc); #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5452 "FlickrPublishing.c" +#line 5451 "FlickrPublishing.c" } @@ -5493,26 +5492,26 @@ 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 5472 "FlickrPublishing.c" +#line 5471 "FlickrPublishing.c" } static gpointer _g_error_copy0 (gpointer self) { #line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? g_error_copy (self) : NULL; -#line 5479 "FlickrPublishing.c" +#line 5478 "FlickrPublishing.c" } @@ -5524,7 +5523,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_return_val_if_fail (xml != NULL, NULL); #line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = NULL; -#line 5491 "FlickrPublishing.c" +#line 5490 "FlickrPublishing.c" { PublishingRESTSupportXmlDocument* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; @@ -5540,7 +5539,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res if (G_UNLIKELY (_inner_error_ != NULL)) { #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 5507 "FlickrPublishing.c" +#line 5506 "FlickrPublishing.c" goto __catch24_spit_publishing_publishing_error; } #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5551,7 +5550,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_clear_error (&_inner_error_); #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5518 "FlickrPublishing.c" +#line 5517 "FlickrPublishing.c" } #line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = _tmp0_; @@ -5563,7 +5562,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _result_ = _tmp3_; #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_tmp0_); -#line 5530 "FlickrPublishing.c" +#line 5529 "FlickrPublishing.c" } goto __finally24; __catch24_spit_publishing_publishing_error: @@ -5595,7 +5594,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _g_free0 (_tmp7_); #line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp9_) { -#line 5562 "FlickrPublishing.c" +#line 5561 "FlickrPublishing.c" GError* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; GError* _tmp12_ = NULL; @@ -5609,7 +5608,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _inner_error_ = _tmp12_; #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 5576 "FlickrPublishing.c" +#line 5575 "FlickrPublishing.c" goto __finally24; } else { GError* _tmp13_ = NULL; @@ -5622,12 +5621,12 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _inner_error_ = _tmp14_; #line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 5589 "FlickrPublishing.c" +#line 5588 "FlickrPublishing.c" goto __finally24; } #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (e); -#line 5594 "FlickrPublishing.c" +#line 5593 "FlickrPublishing.c" } __finally24: #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -5640,7 +5639,7 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res _publishing_rest_support_xml_document_unref0 (_result_); #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5607 "FlickrPublishing.c" +#line 5606 "FlickrPublishing.c" } else { #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_xml_document_unref0 (_result_); @@ -5650,14 +5649,14 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res g_clear_error (&_inner_error_); #line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 5617 "FlickrPublishing.c" +#line 5616 "FlickrPublishing.c" } } #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _result_; #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 5624 "FlickrPublishing.c" +#line 5623 "FlickrPublishing.c" } @@ -5666,7 +5665,7 @@ static void publishing_flickr_transaction_class_init (PublishingFlickrTransactio publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass); #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_transaction_real_execute; -#line 5633 "FlickrPublishing.c" +#line 5632 "FlickrPublishing.c" } @@ -5697,21 +5696,21 @@ PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authenticati self = (PublishingFlickrAuthenticationRequestTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET); #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5664 "FlickrPublishing.c" +#line 5663 "FlickrPublishing.c" } PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_new (PublishingFlickrSession* session) { #line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_authentication_request_transaction_construct (PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session); -#line 5671 "FlickrPublishing.c" +#line 5670 "FlickrPublishing.c" } static void publishing_flickr_authentication_request_transaction_class_init (PublishingFlickrAuthenticationRequestTransactionClass * klass) { #line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5678 "FlickrPublishing.c" +#line 5677 "FlickrPublishing.c" } @@ -5762,21 +5761,21 @@ PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetc _g_free0 (_tmp4_); #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5729 "FlickrPublishing.c" +#line 5728 "FlickrPublishing.c" } PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_new (PublishingFlickrSession* session, const gchar* user_verifier) { #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_access_token_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier); -#line 5736 "FlickrPublishing.c" +#line 5735 "FlickrPublishing.c" } static void publishing_flickr_access_token_fetch_transaction_class_init (PublishingFlickrAccessTokenFetchTransactionClass * klass) { #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5743 "FlickrPublishing.c" +#line 5742 "FlickrPublishing.c" } @@ -5822,21 +5821,21 @@ PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetc _g_free0 (_tmp3_); #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 5789 "FlickrPublishing.c" +#line 5788 "FlickrPublishing.c" } PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) { #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_account_info_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCOUNT_INFO_FETCH_TRANSACTION, session); -#line 5796 "FlickrPublishing.c" +#line 5795 "FlickrPublishing.c" } static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) { #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5803 "FlickrPublishing.c" +#line 5802 "FlickrPublishing.c" } @@ -5859,21 +5858,21 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) { static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) { #line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_parameters_ref (self) : NULL; -#line 5826 "FlickrPublishing.c" +#line 5825 "FlickrPublishing.c" } static gpointer _publishing_rest_support_session_ref0 (gpointer self) { #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 5833 "FlickrPublishing.c" +#line 5832 "FlickrPublishing.c" } static void _g_free0_ (gpointer var) { #line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" var = (g_free (var), NULL); -#line 5840 "FlickrPublishing.c" +#line 5839 "FlickrPublishing.c" } @@ -6067,18 +6066,18 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc if (_tmp37_ == NULL) { #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = TRUE; -#line 6034 "FlickrPublishing.c" +#line 6033 "FlickrPublishing.c" } else { const gchar* _tmp38_ = NULL; #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp38_ = filename; #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp36_ = g_strcmp0 (_tmp38_, "") == 0; -#line 6041 "FlickrPublishing.c" +#line 6040 "FlickrPublishing.c" } #line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp36_) { -#line 6045 "FlickrPublishing.c" +#line 6044 "FlickrPublishing.c" SpitPublishingPublishable* _tmp39_ = NULL; gchar* _tmp40_ = NULL; #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6089,7 +6088,7 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc _g_free0 (filename); #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" filename = _tmp40_; -#line 6056 "FlickrPublishing.c" +#line 6055 "FlickrPublishing.c" } #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp41_ = disposition_table; @@ -6125,14 +6124,14 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc _g_hash_table_unref0 (disposition_table); #line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6092 "FlickrPublishing.c" +#line 6091 "FlickrPublishing.c" } PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable); -#line 6099 "FlickrPublishing.c" +#line 6098 "FlickrPublishing.c" } @@ -6143,13 +6142,13 @@ static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* leng *size = (*size) ? (2 * (*size)) : 4; #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 6110 "FlickrPublishing.c" +#line 6109 "FlickrPublishing.c" } #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6116 "FlickrPublishing.c" +#line 6115 "FlickrPublishing.c" } @@ -6177,14 +6176,14 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _vala_array_add18 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_); -#line 6144 "FlickrPublishing.c" +#line 6143 "FlickrPublishing.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 6151 "FlickrPublishing.c" +#line 6150 "FlickrPublishing.c" } @@ -6195,17 +6194,17 @@ static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportAr result = g_new0 (PublishingRESTSupportArgument*, length + 1); #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (i = 0; i < length; i++) { -#line 6162 "FlickrPublishing.c" +#line 6161 "FlickrPublishing.c" PublishingRESTSupportArgument* _tmp0_ = NULL; #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result[i] = _tmp0_; -#line 6168 "FlickrPublishing.c" +#line 6167 "FlickrPublishing.c" } #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6172 "FlickrPublishing.c" +#line 6171 "FlickrPublishing.c" } @@ -6235,13 +6234,13 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori if (result_length1) { #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp2__length1; -#line 6202 "FlickrPublishing.c" +#line 6201 "FlickrPublishing.c" } #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp2_; #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6208 "FlickrPublishing.c" +#line 6207 "FlickrPublishing.c" } @@ -6255,19 +6254,19 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub _tmp0_ = g_strdup ("OAuth "); #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp0_; -#line 6222 "FlickrPublishing.c" +#line 6221 "FlickrPublishing.c" { gint i = 0; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 6227 "FlickrPublishing.c" +#line 6226 "FlickrPublishing.c" { gboolean _tmp1_ = FALSE; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = TRUE; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" while (TRUE) { -#line 6234 "FlickrPublishing.c" +#line 6233 "FlickrPublishing.c" gint _tmp3_ = 0; PublishingRESTSupportArgument** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -6296,13 +6295,13 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub gint _tmp24__length1 = 0; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp1_) { -#line 6263 "FlickrPublishing.c" +#line 6262 "FlickrPublishing.c" gint _tmp2_ = 0; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = i; #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = _tmp2_ + 1; -#line 6269 "FlickrPublishing.c" +#line 6268 "FlickrPublishing.c" } #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; @@ -6316,7 +6315,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub if (!(_tmp3_ < _tmp4__length1)) { #line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 6283 "FlickrPublishing.c" +#line 6282 "FlickrPublishing.c" } #line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp5_ = _result_; @@ -6382,7 +6381,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub _tmp24__length1 = self->priv->auth_header_fields_length1; #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp23_ < (_tmp24__length1 - 1)) { -#line 6349 "FlickrPublishing.c" +#line 6348 "FlickrPublishing.c" const gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6393,7 +6392,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub _g_free0 (_result_); #line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _result_ = _tmp26_; -#line 6360 "FlickrPublishing.c" +#line 6359 "FlickrPublishing.c" } } } @@ -6402,7 +6401,7 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub result = _result_; #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6369 "FlickrPublishing.c" +#line 6368 "FlickrPublishing.c" } @@ -6439,7 +6438,7 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup _g_free0 (authorization_header); #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 6405 "FlickrPublishing.c" +#line 6404 "FlickrPublishing.c" } else { #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); @@ -6449,12 +6448,12 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup g_clear_error (&_inner_error_); #line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 6415 "FlickrPublishing.c" +#line 6414 "FlickrPublishing.c" } } #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (authorization_header); -#line 6420 "FlickrPublishing.c" +#line 6419 "FlickrPublishing.c" } @@ -6467,14 +6466,14 @@ static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUpl g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate)); #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_upload_transaction_real_execute; -#line 6433 "FlickrPublishing.c" +#line 6432 "FlickrPublishing.c" } static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) { #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 6440 "FlickrPublishing.c" +#line 6439 "FlickrPublishing.c" } @@ -6490,7 +6489,7 @@ static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupport self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj); -#line 6456 "FlickrPublishing.c" +#line 6455 "FlickrPublishing.c" } @@ -6512,14 +6511,14 @@ PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) self = (PublishingFlickrSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_FLICKR_ENDPOINT_URL); #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 6478 "FlickrPublishing.c" +#line 6477 "FlickrPublishing.c" } PublishingFlickrSession* publishing_flickr_session_new (void) { #line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION); -#line 6485 "FlickrPublishing.c" +#line 6484 "FlickrPublishing.c" } @@ -6535,37 +6534,37 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS _tmp2_ = self->priv->access_phase_token; #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp2_ != NULL) { -#line 6501 "FlickrPublishing.c" +#line 6500 "FlickrPublishing.c" const gchar* _tmp3_ = NULL; #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->access_phase_token_secret; #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = _tmp3_ != NULL; -#line 6507 "FlickrPublishing.c" +#line 6506 "FlickrPublishing.c" } else { #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp1_ = FALSE; -#line 6511 "FlickrPublishing.c" +#line 6510 "FlickrPublishing.c" } #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp1_) { -#line 6515 "FlickrPublishing.c" +#line 6514 "FlickrPublishing.c" const gchar* _tmp4_ = NULL; #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = self->priv->username; #line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = _tmp4_ != NULL; -#line 6521 "FlickrPublishing.c" +#line 6520 "FlickrPublishing.c" } else { #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp0_ = FALSE; -#line 6525 "FlickrPublishing.c" +#line 6524 "FlickrPublishing.c" } #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp0_; #line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 6531 "FlickrPublishing.c" +#line 6530 "FlickrPublishing.c" } @@ -6610,7 +6609,7 @@ void publishing_flickr_session_authenticate_from_persistent_credentials (Publish self->priv->username = _tmp5_; #line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 6576 "FlickrPublishing.c" +#line 6575 "FlickrPublishing.c" } @@ -6629,14 +6628,14 @@ void publishing_flickr_session_deauthenticate (PublishingFlickrSession* self) { _g_free0 (self->priv->username); #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->username = NULL; -#line 6595 "FlickrPublishing.c" +#line 6594 "FlickrPublishing.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { #line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 6602 "FlickrPublishing.c" +#line 6601 "FlickrPublishing.c" } @@ -6647,13 +6646,13 @@ static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* leng *size = (*size) ? (2 * (*size)) : 4; #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 6613 "FlickrPublishing.c" +#line 6612 "FlickrPublishing.c" } #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 6619 "FlickrPublishing.c" +#line 6618 "FlickrPublishing.c" } @@ -6758,7 +6757,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp11_ = upload_txn; #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp11_ != NULL) { -#line 6724 "FlickrPublishing.c" +#line 6723 "FlickrPublishing.c" PublishingRESTSupportArgument** auth_header_args = NULL; PublishingFlickrUploadTransaction* _tmp12_ = NULL; gint _tmp13_ = 0; @@ -6784,7 +6783,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp15_ = auth_header_args; #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp15__length1 = auth_header_args_length1; -#line 6749 "FlickrPublishing.c" +#line 6748 "FlickrPublishing.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; @@ -6796,14 +6795,14 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, arg_collection_length1 = _tmp15__length1; #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (arg_it = 0; arg_it < _tmp15__length1; arg_it = arg_it + 1) { -#line 6761 "FlickrPublishing.c" +#line 6760 "FlickrPublishing.c" PublishingRESTSupportArgument* _tmp16_ = NULL; PublishingRESTSupportArgument* arg = NULL; #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arg = _tmp16_; -#line 6768 "FlickrPublishing.c" +#line 6767 "FlickrPublishing.c" { PublishingRESTSupportArgument** _tmp17_ = NULL; gint _tmp17__length1 = 0; @@ -6821,13 +6820,13 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _vala_array_add19 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_); #line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_rest_support_argument_unref0 (arg); -#line 6786 "FlickrPublishing.c" +#line 6785 "FlickrPublishing.c" } } } #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 6792 "FlickrPublishing.c" +#line 6791 "FlickrPublishing.c" } #line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp20_ = base_string_arguments; @@ -6845,19 +6844,19 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp23_ = g_strdup (""); #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp23_; -#line 6810 "FlickrPublishing.c" +#line 6809 "FlickrPublishing.c" { gint i = 0; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = 0; -#line 6815 "FlickrPublishing.c" +#line 6814 "FlickrPublishing.c" { gboolean _tmp24_ = FALSE; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = TRUE; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" while (TRUE) { -#line 6822 "FlickrPublishing.c" +#line 6821 "FlickrPublishing.c" gint _tmp26_ = 0; PublishingRESTSupportArgument** _tmp27_ = NULL; gint _tmp27__length1 = 0; @@ -6882,13 +6881,13 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, gint _tmp43__length1 = 0; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp24_) { -#line 6847 "FlickrPublishing.c" +#line 6846 "FlickrPublishing.c" gint _tmp25_ = 0; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp25_ = i; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" i = _tmp25_ + 1; -#line 6853 "FlickrPublishing.c" +#line 6852 "FlickrPublishing.c" } #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = FALSE; @@ -6902,7 +6901,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, if (!(_tmp26_ < _tmp27__length1)) { #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" break; -#line 6867 "FlickrPublishing.c" +#line 6866 "FlickrPublishing.c" } #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp28_ = arguments_string; @@ -6952,7 +6951,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp43__length1 = sorted_args_length1; #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp42_ < (_tmp43__length1 - 1)) { -#line 6917 "FlickrPublishing.c" +#line 6916 "FlickrPublishing.c" const gchar* _tmp44_ = NULL; gchar* _tmp45_ = NULL; #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6963,7 +6962,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (arguments_string); #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" arguments_string = _tmp45_; -#line 6928 "FlickrPublishing.c" +#line 6927 "FlickrPublishing.c" } } } @@ -6974,7 +6973,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp46_ = self->priv->access_phase_token_secret; #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 6939 "FlickrPublishing.c" +#line 6938 "FlickrPublishing.c" const gchar* _tmp47_ = NULL; gchar* _tmp48_ = NULL; #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -6988,14 +6987,14 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (signing_key); #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp48_; -#line 6952 "FlickrPublishing.c" +#line 6951 "FlickrPublishing.c" } else { const gchar* _tmp49_ = NULL; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp49_ = self->priv->request_phase_token_secret; #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp49_ != NULL) { -#line 6959 "FlickrPublishing.c" +#line 6958 "FlickrPublishing.c" const gchar* _tmp50_ = NULL; gchar* _tmp51_ = NULL; #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7009,7 +7008,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (signing_key); #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp51_; -#line 6972 "FlickrPublishing.c" +#line 6971 "FlickrPublishing.c" } else { gchar* _tmp52_ = NULL; #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7021,7 +7020,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _g_free0 (signing_key); #line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" signing_key = _tmp52_; -#line 6983 "FlickrPublishing.c" +#line 6982 "FlickrPublishing.c" } } #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7104,7 +7103,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp78_ = upload_txn; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp78_ != NULL) { -#line 7066 "FlickrPublishing.c" +#line 7065 "FlickrPublishing.c" PublishingFlickrUploadTransaction* _tmp79_ = NULL; const gchar* _tmp80_ = NULL; #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7113,7 +7112,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp80_ = signature; #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_upload_transaction_add_authorization_header_field (_tmp79_, "oauth_signature", _tmp80_); -#line 7075 "FlickrPublishing.c" +#line 7074 "FlickrPublishing.c" } else { PublishingRESTSupportTransaction* _tmp81_ = NULL; const gchar* _tmp82_ = NULL; @@ -7123,7 +7122,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, _tmp82_ = signature; #line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_rest_support_transaction_add_argument (_tmp81_, "oauth_signature", _tmp82_); -#line 7085 "FlickrPublishing.c" +#line 7084 "FlickrPublishing.c" } #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (signature); @@ -7141,7 +7140,7 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self, base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (http_method); -#line 7103 "FlickrPublishing.c" +#line 7102 "FlickrPublishing.c" } @@ -7172,7 +7171,7 @@ void publishing_flickr_session_set_request_phase_credentials (PublishingFlickrSe _g_free0 (self->priv->request_phase_token_secret); #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->request_phase_token_secret = _tmp3_; -#line 7134 "FlickrPublishing.c" +#line 7133 "FlickrPublishing.c" } @@ -7217,7 +7216,7 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes self->priv->username = _tmp5_; #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 7179 "FlickrPublishing.c" +#line 7178 "FlickrPublishing.c" } @@ -7276,7 +7275,7 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self) result = _tmp11_; #line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7238 "FlickrPublishing.c" +#line 7237 "FlickrPublishing.c" } @@ -7287,39 +7286,39 @@ 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 7261 "FlickrPublishing.c" +#line 7260 "FlickrPublishing.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 7269 "FlickrPublishing.c" +#line 7268 "FlickrPublishing.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 7281 "FlickrPublishing.c" +#line 7280 "FlickrPublishing.c" } } @@ -7337,114 +7336,114 @@ 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 7305 "FlickrPublishing.c" +#line 7304 "FlickrPublishing.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 7311 "FlickrPublishing.c" +#line 7310 "FlickrPublishing.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 7315 "FlickrPublishing.c" +#line 7314 "FlickrPublishing.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 7319 "FlickrPublishing.c" +#line 7318 "FlickrPublishing.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 7331 "FlickrPublishing.c" +#line 7330 "FlickrPublishing.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 7341 "FlickrPublishing.c" +#line 7340 "FlickrPublishing.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 7347 "FlickrPublishing.c" +#line 7346 "FlickrPublishing.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 7361 "FlickrPublishing.c" +#line 7360 "FlickrPublishing.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 7371 "FlickrPublishing.c" +#line 7370 "FlickrPublishing.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 7377 "FlickrPublishing.c" +#line 7376 "FlickrPublishing.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 7386 "FlickrPublishing.c" +#line 7385 "FlickrPublishing.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 7406 "FlickrPublishing.c" +#line 7405 "FlickrPublishing.c" } @@ -7473,7 +7472,7 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s result = _tmp4_; #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7435 "FlickrPublishing.c" +#line 7434 "FlickrPublishing.c" } @@ -7496,7 +7495,7 @@ gchar* publishing_flickr_session_get_request_phase_token (PublishingFlickrSessio result = _tmp2_; #line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7458 "FlickrPublishing.c" +#line 7457 "FlickrPublishing.c" } @@ -7519,7 +7518,7 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession result = _tmp2_; #line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7481 "FlickrPublishing.c" +#line 7480 "FlickrPublishing.c" } @@ -7542,7 +7541,7 @@ gchar* publishing_flickr_session_get_access_phase_token_secret (PublishingFlickr result = _tmp2_; #line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7504 "FlickrPublishing.c" +#line 7503 "FlickrPublishing.c" } @@ -7565,7 +7564,7 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) { result = _tmp2_; #line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 7527 "FlickrPublishing.c" +#line 7526 "FlickrPublishing.c" } @@ -7578,7 +7577,7 @@ static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate)); #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_flickr_session_real_is_authenticated; -#line 7540 "FlickrPublishing.c" +#line 7539 "FlickrPublishing.c" } @@ -7595,7 +7594,7 @@ static void publishing_flickr_session_instance_init (PublishingFlickrSession * s self->priv->access_phase_token_secret = NULL; #line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->username = NULL; -#line 7557 "FlickrPublishing.c" +#line 7556 "FlickrPublishing.c" } @@ -7615,7 +7614,7 @@ static void publishing_flickr_session_finalize (PublishingRESTSupportSession* ob _g_free0 (self->priv->username); #line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_flickr_session_parent_class)->finalize (obj); -#line 7577 "FlickrPublishing.c" +#line 7576 "FlickrPublishing.c" } @@ -7634,28 +7633,28 @@ GType publishing_flickr_session_get_type (void) { static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 7596 "FlickrPublishing.c" +#line 7595 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { #line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self); -#line 7603 "FlickrPublishing.c" +#line 7602 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 7610 "FlickrPublishing.c" +#line 7609 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self); -#line 7617 "FlickrPublishing.c" +#line 7616 "FlickrPublishing.c" } @@ -7903,7 +7902,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _tmp48_ = _tmp47_->user_kind; #line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp48_ == PUBLISHING_FLICKR_USER_KIND_FREE) { -#line 7865 "FlickrPublishing.c" +#line 7864 "FlickrPublishing.c" const gchar* _tmp49_ = NULL; PublishingFlickrPublishingParameters* _tmp50_ = NULL; gint _tmp51_ = 0; @@ -7941,7 +7940,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane upload_label_text = _tmp57_; #line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp56_); -#line 7899 "FlickrPublishing.c" +#line 7898 "FlickrPublishing.c" } else { const gchar* _tmp58_ = NULL; const gchar* _tmp59_ = NULL; @@ -7956,7 +7955,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _g_free0 (upload_label_text); #line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" upload_label_text = _tmp60_; -#line 7914 "FlickrPublishing.c" +#line 7913 "FlickrPublishing.c" } #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp61_ = self->priv->upload_info_label; @@ -7974,7 +7973,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _tmp65_ = media_type; #line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp65_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 7932 "FlickrPublishing.c" +#line 7931 "FlickrPublishing.c" const gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; #line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -7985,14 +7984,14 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _g_free0 (visibility_label_text); #line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp67_; -#line 7943 "FlickrPublishing.c" +#line 7942 "FlickrPublishing.c" } else { SpitPublishingPublisherMediaType _tmp68_ = 0; #line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp68_ = media_type; #line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp68_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) { -#line 7950 "FlickrPublishing.c" +#line 7949 "FlickrPublishing.c" const gchar* _tmp69_ = NULL; gchar* _tmp70_ = NULL; #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8003,7 +8002,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _g_free0 (visibility_label_text); #line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" visibility_label_text = _tmp70_; -#line 7961 "FlickrPublishing.c" +#line 7960 "FlickrPublishing.c" } } #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8022,7 +8021,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _tmp74_ = media_type; #line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp74_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 7980 "FlickrPublishing.c" +#line 7979 "FlickrPublishing.c" GtkComboBoxText* _tmp75_ = NULL; #line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_populate_size_combo (self); @@ -8030,7 +8029,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _tmp75_ = self->priv->size_combo; #line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); -#line 7988 "FlickrPublishing.c" +#line 7987 "FlickrPublishing.c" } else { GtkComboBoxText* _tmp76_ = NULL; GtkLabel* _tmp77_ = NULL; @@ -8042,7 +8041,7 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _tmp77_ = self->priv->size_label; #line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 8000 "FlickrPublishing.c" +#line 7999 "FlickrPublishing.c" } #line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp78_ = self->priv->strip_metadata_check; @@ -8064,14 +8063,14 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane _g_free0 (upload_label_text); #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 8022 "FlickrPublishing.c" +#line 8021 "FlickrPublishing.c" } PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) { #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, publisher, parameters, media_type, builder, strip_metadata); -#line 8029 "FlickrPublishing.c" +#line 8028 "FlickrPublishing.c" } @@ -8080,14 +8079,14 @@ static void publishing_flickr_publishing_options_pane_on_logout_clicked (Publish g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 8038 "FlickrPublishing.c" +#line 8037 "FlickrPublishing.c" } static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) { #line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_visibility_specification_ref (self) : NULL; -#line 8045 "FlickrPublishing.c" +#line 8044 "FlickrPublishing.c" } @@ -8129,7 +8128,7 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis _tmp7_ = self->priv->media_type; #line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) { -#line 8087 "FlickrPublishing.c" +#line 8086 "FlickrPublishing.c" PublishingFlickrPublishingParameters* _tmp8_ = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL; gint _tmp9__length1 = 0; @@ -8153,7 +8152,7 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis _tmp13_ = _tmp12_->size; #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp8_->photo_major_axis_size = _tmp13_; -#line 8111 "FlickrPublishing.c" +#line 8110 "FlickrPublishing.c" } #line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = self->priv->strip_metadata_check; @@ -8161,7 +8160,7 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis _tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "publish", _tmp15_); -#line 8119 "FlickrPublishing.c" +#line 8118 "FlickrPublishing.c" } @@ -8172,13 +8171,13 @@ static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEn *size = (*size) ? (2 * (*size)) : 4; #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8130 "FlickrPublishing.c" +#line 8129 "FlickrPublishing.c" } #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8136 "FlickrPublishing.c" +#line 8135 "FlickrPublishing.c" } @@ -8189,13 +8188,13 @@ static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEn *size = (*size) ? (2 * (*size)) : 4; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8147 "FlickrPublishing.c" +#line 8146 "FlickrPublishing.c" } #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8153 "FlickrPublishing.c" +#line 8152 "FlickrPublishing.c" } @@ -8206,13 +8205,13 @@ static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEn *size = (*size) ? (2 * (*size)) : 4; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8164 "FlickrPublishing.c" +#line 8163 "FlickrPublishing.c" } #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8170 "FlickrPublishing.c" +#line 8169 "FlickrPublishing.c" } @@ -8223,13 +8222,13 @@ static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEn *size = (*size) ? (2 * (*size)) : 4; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8181 "FlickrPublishing.c" +#line 8180 "FlickrPublishing.c" } #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8187 "FlickrPublishing.c" +#line 8186 "FlickrPublishing.c" } @@ -8240,13 +8239,13 @@ static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEn *size = (*size) ? (2 * (*size)) : 4; #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1); -#line 8198 "FlickrPublishing.c" +#line 8197 "FlickrPublishing.c" } #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8204 "FlickrPublishing.c" +#line 8203 "FlickrPublishing.c" } @@ -8386,20 +8385,20 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_ if (result_length1) { #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp26__length1; -#line 8344 "FlickrPublishing.c" +#line 8343 "FlickrPublishing.c" } #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp26_; #line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8350 "FlickrPublishing.c" +#line 8349 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) { #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL; -#line 8357 "FlickrPublishing.c" +#line 8356 "FlickrPublishing.c" } @@ -8419,7 +8418,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo _tmp0__length1 = self->priv->visibilities_length1; #line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 8377 "FlickrPublishing.c" +#line 8376 "FlickrPublishing.c" gint _tmp1_ = 0; PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8432,13 +8431,13 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo self->priv->visibilities_length1 = _tmp1_; #line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_visibilities_size_ = self->priv->visibilities_length1; -#line 8390 "FlickrPublishing.c" +#line 8389 "FlickrPublishing.c" } #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->visibilities; #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->visibilities_length1; -#line 8396 "FlickrPublishing.c" +#line 8395 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL; gint v_collection_length1 = 0; @@ -8450,14 +8449,14 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo v_collection_length1 = _tmp3__length1; #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) { -#line 8408 "FlickrPublishing.c" +#line 8407 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL; PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL; #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]); #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" v = _tmp4_; -#line 8415 "FlickrPublishing.c" +#line 8414 "FlickrPublishing.c" { GtkComboBoxText* _tmp5_ = NULL; PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL; @@ -8472,7 +8471,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo gtk_combo_box_text_append_text (_tmp5_, _tmp7_); #line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v); -#line 8430 "FlickrPublishing.c" +#line 8429 "FlickrPublishing.c" } } } @@ -8484,7 +8483,7 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_); #line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 8442 "FlickrPublishing.c" +#line 8441 "FlickrPublishing.c" } @@ -8495,13 +8494,13 @@ static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry*** *size = (*size) ? (2 * (*size)) : 4; #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8453 "FlickrPublishing.c" +#line 8452 "FlickrPublishing.c" } #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8459 "FlickrPublishing.c" +#line 8458 "FlickrPublishing.c" } @@ -8512,13 +8511,13 @@ static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** *size = (*size) ? (2 * (*size)) : 4; #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8470 "FlickrPublishing.c" +#line 8469 "FlickrPublishing.c" } #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8476 "FlickrPublishing.c" +#line 8475 "FlickrPublishing.c" } @@ -8529,13 +8528,13 @@ static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** *size = (*size) ? (2 * (*size)) : 4; #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8487 "FlickrPublishing.c" +#line 8486 "FlickrPublishing.c" } #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8493 "FlickrPublishing.c" +#line 8492 "FlickrPublishing.c" } @@ -8546,13 +8545,13 @@ static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** *size = (*size) ? (2 * (*size)) : 4; #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8504 "FlickrPublishing.c" +#line 8503 "FlickrPublishing.c" } #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8510 "FlickrPublishing.c" +#line 8509 "FlickrPublishing.c" } @@ -8563,13 +8562,13 @@ static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** *size = (*size) ? (2 * (*size)) : 4; #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1); -#line 8521 "FlickrPublishing.c" +#line 8520 "FlickrPublishing.c" } #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 8527 "FlickrPublishing.c" +#line 8526 "FlickrPublishing.c" } @@ -8669,20 +8668,20 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis if (result_length1) { #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *result_length1 = _tmp16__length1; -#line 8627 "FlickrPublishing.c" +#line 8626 "FlickrPublishing.c" } #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" result = _tmp16_; #line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8633 "FlickrPublishing.c" +#line 8632 "FlickrPublishing.c" } static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) { #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL; -#line 8640 "FlickrPublishing.c" +#line 8639 "FlickrPublishing.c" } @@ -8702,7 +8701,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi _tmp0__length1 = self->priv->sizes_length1; #line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp0_ == NULL) { -#line 8660 "FlickrPublishing.c" +#line 8659 "FlickrPublishing.c" gint _tmp1_ = 0; PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL; #line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -8715,13 +8714,13 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi self->priv->sizes_length1 = _tmp1_; #line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->_sizes_size_ = self->priv->sizes_length1; -#line 8673 "FlickrPublishing.c" +#line 8672 "FlickrPublishing.c" } #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3_ = self->priv->sizes; #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp3__length1 = self->priv->sizes_length1; -#line 8679 "FlickrPublishing.c" +#line 8678 "FlickrPublishing.c" { PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL; gint e_collection_length1 = 0; @@ -8733,14 +8732,14 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi e_collection_length1 = _tmp3__length1; #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) { -#line 8691 "FlickrPublishing.c" +#line 8690 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL; #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]); #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" e = _tmp4_; -#line 8698 "FlickrPublishing.c" +#line 8697 "FlickrPublishing.c" { GtkComboBoxText* _tmp5_ = NULL; PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL; @@ -8755,7 +8754,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi gtk_combo_box_text_append_text (_tmp5_, _tmp7_); #line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _publishing_flickr_publishing_options_pane_size_entry_unref0 (e); -#line 8713 "FlickrPublishing.c" +#line 8712 "FlickrPublishing.c" } } } @@ -8767,7 +8766,7 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi _tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_); #line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 8725 "FlickrPublishing.c" +#line 8724 "FlickrPublishing.c" } @@ -8785,7 +8784,7 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 8743 "FlickrPublishing.c" +#line 8742 "FlickrPublishing.c" } @@ -8803,7 +8802,7 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_); -#line 8761 "FlickrPublishing.c" +#line 8760 "FlickrPublishing.c" } @@ -8818,7 +8817,7 @@ void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrP _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); #line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "publish", _tmp1_); -#line 8776 "FlickrPublishing.c" +#line 8775 "FlickrPublishing.c" } @@ -8827,7 +8826,7 @@ void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPu g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self)); #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 8785 "FlickrPublishing.c" +#line 8784 "FlickrPublishing.c" } @@ -8846,7 +8845,7 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi result = _tmp1_; #line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8804 "FlickrPublishing.c" +#line 8803 "FlickrPublishing.c" } @@ -8859,21 +8858,21 @@ static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_opti result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; #line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 8817 "FlickrPublishing.c" +#line 8816 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish (PublishingFlickrPublishingOptionsPane* _sender, gboolean strip_metadata, gpointer self) { #line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self); -#line 8824 "FlickrPublishing.c" +#line 8823 "FlickrPublishing.c" } static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) { #line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self); -#line 8831 "FlickrPublishing.c" +#line 8830 "FlickrPublishing.c" } @@ -8885,7 +8884,7 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_installed (Sp g_signal_connect_object (self, "publish", (GCallback) _publishing_flickr_publishing_options_pane_notify_publish_publishing_flickr_publishing_options_pane_publish, self, 0); #line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_connect_object (self, "logout", (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self, 0); -#line 8843 "FlickrPublishing.c" +#line 8842 "FlickrPublishing.c" } @@ -8903,7 +8902,7 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled ( g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); #line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout, self); -#line 8861 "FlickrPublishing.c" +#line 8860 "FlickrPublishing.c" } @@ -8930,21 +8929,21 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish self->size = _tmp2_; #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 8888 "FlickrPublishing.c" +#line 8887 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) { #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_size_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY, creator_title, creator_size); -#line 8895 "FlickrPublishing.c" +#line 8894 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 8902 "FlickrPublishing.c" +#line 8901 "FlickrPublishing.c" } @@ -8953,7 +8952,7 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_free_valu if (value->data[0].v_pointer) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer); -#line 8911 "FlickrPublishing.c" +#line 8910 "FlickrPublishing.c" } } @@ -8963,11 +8962,11 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu if (src_value->data[0].v_pointer) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (src_value->data[0].v_pointer); -#line 8921 "FlickrPublishing.c" +#line 8920 "FlickrPublishing.c" } else { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 8925 "FlickrPublishing.c" +#line 8924 "FlickrPublishing.c" } } @@ -8975,37 +8974,37 @@ static void publishing_flickr_publishing_options_pane_value_size_entry_copy_valu static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 8933 "FlickrPublishing.c" +#line 8932 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 8940 "FlickrPublishing.c" +#line 8939 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneSizeEntry* object; object = collect_values[0].v_pointer; #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8947 "FlickrPublishing.c" +#line 8946 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8951 "FlickrPublishing.c" +#line 8950 "FlickrPublishing.c" } #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object); -#line 8955 "FlickrPublishing.c" +#line 8954 "FlickrPublishing.c" } else { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 8959 "FlickrPublishing.c" +#line 8958 "FlickrPublishing.c" } #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 8963 "FlickrPublishing.c" +#line 8962 "FlickrPublishing.c" } @@ -9016,25 +9015,25 @@ static gchar* publishing_flickr_publishing_options_pane_value_size_entry_lcopy_v if (!object_p) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8974 "FlickrPublishing.c" +#line 8973 "FlickrPublishing.c" } #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 8980 "FlickrPublishing.c" +#line 8979 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 8984 "FlickrPublishing.c" +#line 8983 "FlickrPublishing.c" } else { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 8988 "FlickrPublishing.c" +#line 8987 "FlickrPublishing.c" } #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 8992 "FlickrPublishing.c" +#line 8991 "FlickrPublishing.c" } @@ -9048,7 +9047,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_size_ent G_PARAM_SPEC (spec)->value_type = object_type; #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 9006 "FlickrPublishing.c" +#line 9005 "FlickrPublishing.c" } @@ -9057,7 +9056,7 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry ( g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_ENTRY), NULL); #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 9015 "FlickrPublishing.c" +#line 9014 "FlickrPublishing.c" } @@ -9077,17 +9076,17 @@ static void publishing_flickr_publishing_options_pane_value_set_size_entry (GVal value->data[0].v_pointer = v_object; #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer); -#line 9035 "FlickrPublishing.c" +#line 9034 "FlickrPublishing.c" } else { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9039 "FlickrPublishing.c" +#line 9038 "FlickrPublishing.c" } #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 9045 "FlickrPublishing.c" +#line 9044 "FlickrPublishing.c" } } @@ -9106,17 +9105,17 @@ static void publishing_flickr_publishing_options_pane_value_take_size_entry (GVa g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 9064 "FlickrPublishing.c" +#line 9063 "FlickrPublishing.c" } else { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9068 "FlickrPublishing.c" +#line 9067 "FlickrPublishing.c" } #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_size_entry_unref (old); -#line 9074 "FlickrPublishing.c" +#line 9073 "FlickrPublishing.c" } } @@ -9126,14 +9125,14 @@ static void publishing_flickr_publishing_options_pane_size_entry_class_init (Pub publishing_flickr_publishing_options_pane_size_entry_parent_class = g_type_class_peek_parent (klass); #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize; -#line 9084 "FlickrPublishing.c" +#line 9083 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) { #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 9091 "FlickrPublishing.c" +#line 9090 "FlickrPublishing.c" } @@ -9145,7 +9144,7 @@ static void publishing_flickr_publishing_options_pane_size_entry_finalize (Publi g_signal_handlers_destroy (self); #line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 9103 "FlickrPublishing.c" +#line 9102 "FlickrPublishing.c" } @@ -9170,7 +9169,7 @@ static gpointer publishing_flickr_publishing_options_pane_size_entry_ref (gpoint g_atomic_int_inc (&self->ref_count); #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 9128 "FlickrPublishing.c" +#line 9127 "FlickrPublishing.c" } @@ -9183,7 +9182,7 @@ static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self); #line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9141 "FlickrPublishing.c" +#line 9140 "FlickrPublishing.c" } } @@ -9218,21 +9217,21 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p self->title = _tmp3_; #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 9176 "FlickrPublishing.c" +#line 9175 "FlickrPublishing.c" } static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) { #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_publishing_options_pane_visibility_entry_construct (PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY, creator_title, creator_specification); -#line 9183 "FlickrPublishing.c" +#line 9182 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9190 "FlickrPublishing.c" +#line 9189 "FlickrPublishing.c" } @@ -9241,7 +9240,7 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_fre if (value->data[0].v_pointer) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer); -#line 9199 "FlickrPublishing.c" +#line 9198 "FlickrPublishing.c" } } @@ -9251,11 +9250,11 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop if (src_value->data[0].v_pointer) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (src_value->data[0].v_pointer); -#line 9209 "FlickrPublishing.c" +#line 9208 "FlickrPublishing.c" } else { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 9213 "FlickrPublishing.c" +#line 9212 "FlickrPublishing.c" } } @@ -9263,37 +9262,37 @@ static void publishing_flickr_publishing_options_pane_value_visibility_entry_cop static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 9221 "FlickrPublishing.c" +#line 9220 "FlickrPublishing.c" } static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (collect_values[0].v_pointer) { -#line 9228 "FlickrPublishing.c" +#line 9227 "FlickrPublishing.c" PublishingFlickrPublishingOptionsPaneVisibilityEntry* object; object = collect_values[0].v_pointer; #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (object->parent_instance.g_class == NULL) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9235 "FlickrPublishing.c" +#line 9234 "FlickrPublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9239 "FlickrPublishing.c" +#line 9238 "FlickrPublishing.c" } #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object); -#line 9243 "FlickrPublishing.c" +#line 9242 "FlickrPublishing.c" } else { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9247 "FlickrPublishing.c" +#line 9246 "FlickrPublishing.c" } #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 9251 "FlickrPublishing.c" +#line 9250 "FlickrPublishing.c" } @@ -9304,25 +9303,25 @@ static gchar* publishing_flickr_publishing_options_pane_value_visibility_entry_l if (!object_p) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9262 "FlickrPublishing.c" +#line 9261 "FlickrPublishing.c" } #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!value->data[0].v_pointer) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = NULL; -#line 9268 "FlickrPublishing.c" +#line 9267 "FlickrPublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = value->data[0].v_pointer; -#line 9272 "FlickrPublishing.c" +#line 9271 "FlickrPublishing.c" } else { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *object_p = publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 9276 "FlickrPublishing.c" +#line 9275 "FlickrPublishing.c" } #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return NULL; -#line 9280 "FlickrPublishing.c" +#line 9279 "FlickrPublishing.c" } @@ -9336,7 +9335,7 @@ static GParamSpec* publishing_flickr_publishing_options_pane_param_spec_visibili G_PARAM_SPEC (spec)->value_type = object_type; #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return G_PARAM_SPEC (spec); -#line 9294 "FlickrPublishing.c" +#line 9293 "FlickrPublishing.c" } @@ -9345,7 +9344,7 @@ static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_e g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_TYPE_VISIBILITY_ENTRY), NULL); #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return value->data[0].v_pointer; -#line 9303 "FlickrPublishing.c" +#line 9302 "FlickrPublishing.c" } @@ -9365,17 +9364,17 @@ static void publishing_flickr_publishing_options_pane_value_set_visibility_entry value->data[0].v_pointer = v_object; #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer); -#line 9323 "FlickrPublishing.c" +#line 9322 "FlickrPublishing.c" } else { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9327 "FlickrPublishing.c" +#line 9326 "FlickrPublishing.c" } #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 9333 "FlickrPublishing.c" +#line 9332 "FlickrPublishing.c" } } @@ -9394,17 +9393,17 @@ static void publishing_flickr_publishing_options_pane_value_take_visibility_entr g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = v_object; -#line 9352 "FlickrPublishing.c" +#line 9351 "FlickrPublishing.c" } else { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" value->data[0].v_pointer = NULL; -#line 9356 "FlickrPublishing.c" +#line 9355 "FlickrPublishing.c" } #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (old) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishing_flickr_publishing_options_pane_visibility_entry_unref (old); -#line 9362 "FlickrPublishing.c" +#line 9361 "FlickrPublishing.c" } } @@ -9414,14 +9413,14 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_class_ini publishing_flickr_publishing_options_pane_visibility_entry_parent_class = g_type_class_peek_parent (klass); #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize; -#line 9372 "FlickrPublishing.c" +#line 9371 "FlickrPublishing.c" } static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) { #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->ref_count = 1; -#line 9379 "FlickrPublishing.c" +#line 9378 "FlickrPublishing.c" } @@ -9435,7 +9434,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_finalize _publishing_flickr_visibility_specification_unref0 (self->specification); #line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (self->title); -#line 9393 "FlickrPublishing.c" +#line 9392 "FlickrPublishing.c" } @@ -9460,7 +9459,7 @@ static gpointer publishing_flickr_publishing_options_pane_visibility_entry_ref ( g_atomic_int_inc (&self->ref_count); #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return instance; -#line 9418 "FlickrPublishing.c" +#line 9417 "FlickrPublishing.c" } @@ -9473,7 +9472,7 @@ static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gp PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self); #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9431 "FlickrPublishing.c" +#line 9430 "FlickrPublishing.c" } } @@ -9489,7 +9488,7 @@ static void publishing_flickr_publishing_options_pane_class_init (PublishingFlic g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 9447 "FlickrPublishing.c" +#line 9446 "FlickrPublishing.c" } @@ -9504,7 +9503,7 @@ static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pan iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_installed; #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_on_pane_uninstalled; -#line 9462 "FlickrPublishing.c" +#line 9461 "FlickrPublishing.c" } @@ -9545,7 +9544,7 @@ static void publishing_flickr_publishing_options_pane_instance_init (PublishingF self->priv->parameters = NULL; #line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv->publisher = NULL; -#line 9503 "FlickrPublishing.c" +#line 9502 "FlickrPublishing.c" } @@ -9583,7 +9582,7 @@ static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->publisher); #line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj); -#line 9541 "FlickrPublishing.c" +#line 9540 "FlickrPublishing.c" } @@ -9635,14 +9634,14 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ self->priv->strip_metadata = _tmp4_; #line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return self; -#line 9593 "FlickrPublishing.c" +#line 9592 "FlickrPublishing.c" } PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) { #line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return publishing_flickr_uploader_construct (PUBLISHING_FLICKR_TYPE_UPLOADER, session, publishables, publishables_length1, parameters, strip_metadata); -#line 9600 "FlickrPublishing.c" +#line 9599 "FlickrPublishing.c" } @@ -9653,13 +9652,13 @@ static void _vala_array_add30 (gchar*** array, int* length, int* size, gchar* va *size = (*size) ? (2 * (*size)) : 4; #line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 9611 "FlickrPublishing.c" +#line 9610 "FlickrPublishing.c" } #line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[(*length)++] = value; #line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" (*array)[*length] = NULL; -#line 9617 "FlickrPublishing.c" +#line 9616 "FlickrPublishing.c" } @@ -9689,13 +9688,13 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) { #line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 9647 "FlickrPublishing.c" +#line 9646 "FlickrPublishing.c" } #line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp2_ = gexiv2_metadata_new (); #line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" publishable_metadata = _tmp2_; -#line 9653 "FlickrPublishing.c" +#line 9652 "FlickrPublishing.c" { GExiv2Metadata* _tmp3_ = NULL; SpitPublishingPublishable* _tmp4_ = NULL; @@ -9723,7 +9722,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp6_); #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 9681 "FlickrPublishing.c" +#line 9680 "FlickrPublishing.c" goto __catch25_g_error; } } @@ -9759,20 +9758,20 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp11_); #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 9716 "FlickrPublishing.c" +#line 9715 "FlickrPublishing.c" } __finally25: #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _gexiv2_metadata_free0 (publishable_metadata); + _g_object_unref0 (publishable_metadata); #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 9729 "FlickrPublishing.c" +#line 9728 "FlickrPublishing.c" } #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp14_ = publishable_metadata; @@ -9781,10 +9780,10 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (!_tmp15_) { #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _gexiv2_metadata_free0 (publishable_metadata); + _g_object_unref0 (publishable_metadata); #line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 9741 "FlickrPublishing.c" +#line 9740 "FlickrPublishing.c" } #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp16_ = publishable_metadata; @@ -9792,7 +9791,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption"); #line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp17_) { -#line 9749 "FlickrPublishing.c" +#line 9748 "FlickrPublishing.c" GExiv2Metadata* _tmp18_ = NULL; GExiv2Metadata* _tmp19_ = NULL; gchar* _tmp20_ = NULL; @@ -9817,7 +9816,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_free0 (_tmp23_); #line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp21_); -#line 9774 "FlickrPublishing.c" +#line 9773 "FlickrPublishing.c" } #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp24_ = publishable_metadata; @@ -9825,7 +9824,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline"); #line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp25_) { -#line 9782 "FlickrPublishing.c" +#line 9781 "FlickrPublishing.c" GExiv2Metadata* _tmp26_ = NULL; GExiv2Metadata* _tmp27_ = NULL; gchar* _tmp28_ = NULL; @@ -9850,7 +9849,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_free0 (_tmp31_); #line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (_tmp29_); -#line 9807 "FlickrPublishing.c" +#line 9806 "FlickrPublishing.c" } #line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp32_ = publishable_metadata; @@ -9858,7 +9857,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords"); #line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp33_) { -#line 9815 "FlickrPublishing.c" +#line 9814 "FlickrPublishing.c" GeeSet* keyword_set = NULL; GeeHashSet* _tmp34_ = NULL; gchar** iptc_keywords = NULL; @@ -9918,14 +9917,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp38__length1 = iptc_keywords_length1; #line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp38_ != NULL) { -#line 9875 "FlickrPublishing.c" +#line 9874 "FlickrPublishing.c" gchar** _tmp39_ = NULL; gint _tmp39__length1 = 0; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39_ = iptc_keywords; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp39__length1 = iptc_keywords_length1; -#line 9882 "FlickrPublishing.c" +#line 9881 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; @@ -9937,14 +9936,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU keyword_collection_length1 = _tmp39__length1; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) { -#line 9894 "FlickrPublishing.c" +#line 9893 "FlickrPublishing.c" gchar* _tmp40_ = NULL; gchar* keyword = NULL; #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp40_ = g_strdup (keyword_collection[keyword_it]); #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp40_; -#line 9901 "FlickrPublishing.c" +#line 9900 "FlickrPublishing.c" { GeeSet* _tmp41_ = NULL; const gchar* _tmp42_ = NULL; @@ -9956,7 +9955,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_); #line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 9913 "FlickrPublishing.c" +#line 9912 "FlickrPublishing.c" } } } @@ -9977,14 +9976,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp46__length1 = xmp_keywords_length1; #line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (_tmp46_ != NULL) { -#line 9934 "FlickrPublishing.c" +#line 9933 "FlickrPublishing.c" gchar** _tmp47_ = NULL; gint _tmp47__length1 = 0; #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47_ = xmp_keywords; #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp47__length1 = xmp_keywords_length1; -#line 9941 "FlickrPublishing.c" +#line 9940 "FlickrPublishing.c" { gchar** keyword_collection = NULL; gint keyword_collection_length1 = 0; @@ -9996,14 +9995,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU keyword_collection_length1 = _tmp47__length1; #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) { -#line 9953 "FlickrPublishing.c" +#line 9952 "FlickrPublishing.c" gchar* _tmp48_ = NULL; gchar* keyword = NULL; #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _tmp48_ = g_strdup (keyword_collection[keyword_it]); #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" keyword = _tmp48_; -#line 9960 "FlickrPublishing.c" +#line 9959 "FlickrPublishing.c" { GeeSet* _tmp49_ = NULL; const gchar* _tmp50_ = NULL; @@ -10015,7 +10014,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_); #line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_free0 (keyword); -#line 9972 "FlickrPublishing.c" +#line 9971 "FlickrPublishing.c" } } } @@ -10070,7 +10069,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _tmp61__length1 = no_keywords_length1; #line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_); -#line 10027 "FlickrPublishing.c" +#line 10026 "FlickrPublishing.c" { GExiv2Metadata* _tmp62_ = NULL; SpitPublishingPublishable* _tmp63_ = NULL; @@ -10098,7 +10097,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp65_); #line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 10055 "FlickrPublishing.c" +#line 10054 "FlickrPublishing.c" goto __catch26_g_error; } } @@ -10134,7 +10133,7 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU _g_object_unref0 (_tmp70_); #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_error_free0 (err); -#line 10090 "FlickrPublishing.c" +#line 10089 "FlickrPublishing.c" } __finally26: #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" @@ -10150,14 +10149,14 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (keyword_set); #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _gexiv2_metadata_free0 (publishable_metadata); + _g_object_unref0 (publishable_metadata); #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" g_clear_error (&_inner_error_); #line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return; -#line 10113 "FlickrPublishing.c" +#line 10112 "FlickrPublishing.c" } #line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL); @@ -10169,11 +10168,11 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL); #line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" _g_object_unref0 (keyword_set); -#line 10125 "FlickrPublishing.c" +#line 10124 "FlickrPublishing.c" } #line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" - _gexiv2_metadata_free0 (publishable_metadata); -#line 10129 "FlickrPublishing.c" + _g_object_unref0 (publishable_metadata); +#line 10128 "FlickrPublishing.c" } @@ -10223,7 +10222,7 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_ result = _tmp8_; #line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" return result; -#line 10179 "FlickrPublishing.c" +#line 10178 "FlickrPublishing.c" } @@ -10236,14 +10235,14 @@ static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate)); #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_flickr_uploader_real_create_transaction; -#line 10192 "FlickrPublishing.c" +#line 10191 "FlickrPublishing.c" } static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) { #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self); -#line 10199 "FlickrPublishing.c" +#line 10198 "FlickrPublishing.c" } @@ -10255,7 +10254,7 @@ static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploa _publishing_flickr_publishing_parameters_unref0 (self->priv->parameters); #line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj); -#line 10211 "FlickrPublishing.c" +#line 10210 "FlickrPublishing.c" } diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c index cda058e..abbd994 100644 --- a/plugins/shotwell-publishing/PicasaPublishing.c +++ b/plugins/shotwell-publishing/PicasaPublishing.c @@ -1,4 +1,4 @@ -/* PicasaPublishing.c generated by valac 0.32.1, the Vala compiler +/* PicasaPublishing.c generated by valac 0.34.1, the Vala compiler * generated from PicasaPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3689,37 +3689,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 3677 "PicasaPublishing.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 3685 "PicasaPublishing.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 3697 "PicasaPublishing.c" } @@ -3739,112 +3739,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 3721 "PicasaPublishing.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 3727 "PicasaPublishing.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 3731 "PicasaPublishing.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 3735 "PicasaPublishing.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 3747 "PicasaPublishing.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 3757 "PicasaPublishing.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 3763 "PicasaPublishing.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 3777 "PicasaPublishing.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 3787 "PicasaPublishing.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 3793 "PicasaPublishing.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 3802 "PicasaPublishing.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 3822 "PicasaPublishing.c" } @@ -3857,72 +3857,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; #line 3839 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 3849 "PicasaPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 3859 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 3865 "PicasaPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 3876 "PicasaPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 3888 "PicasaPublishing.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 3892 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 3896 "PicasaPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 3900 "PicasaPublishing.c" gint i = 0; @@ -3945,16 +3945,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; #line 3923 "PicasaPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 3932 "PicasaPublishing.c" gboolean _tmp11_ = FALSE; @@ -3967,97 +3967,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { #line 3945 "PicasaPublishing.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 3951 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 3961 "PicasaPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 3973 "PicasaPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 3977 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 3983 "PicasaPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 3994 "PicasaPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 4009 "PicasaPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 4013 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 4017 "PicasaPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 4023 "PicasaPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 4035 "PicasaPublishing.c" gchar** _tmp25_ = NULL; @@ -4066,91 +4066,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; #line 4056 "PicasaPublishing.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 4060 "PicasaPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 4066 "PicasaPublishing.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 4073 "PicasaPublishing.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 4081 "PicasaPublishing.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 4119 "PicasaPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 4128 "PicasaPublishing.c" gint _tmp48_ = 0; @@ -4166,94 +4166,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { #line 4144 "PicasaPublishing.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 4150 "PicasaPublishing.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 4164 "PicasaPublishing.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 4184 "PicasaPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 4199 "PicasaPublishing.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 4203 "PicasaPublishing.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 4211 "PicasaPublishing.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 4222 "PicasaPublishing.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 4231 "PicasaPublishing.c" } @@ -4272,39 +4272,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 4276 "PicasaPublishing.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 4282 "PicasaPublishing.c" } @@ -5784,19 +5784,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 5774 "PicasaPublishing.c" } @@ -6959,11 +6959,11 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); #line 6941 "PicasaPublishing.c" { @@ -6978,73 +6978,73 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 6972 "PicasaPublishing.c" goto __catch15_g_regex_error; } -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 6981 "PicasaPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { #line 6997 "PicasaPublishing.c" goto __catch15_g_regex_error; } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 7008 "PicasaPublishing.c" } -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp9_; -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 7022 "PicasaPublishing.c" } @@ -7052,24 +7052,24 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* __catch15_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); #line 7036 "PicasaPublishing.c" } __finally15: -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; #line 7047 "PicasaPublishing.c" } diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c index 6b684ba..f8c3b68 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.c +++ b/plugins/shotwell-publishing/PiwigoPublishing.c @@ -1,4 +1,4 @@ -/* PiwigoPublishing.c generated by valac 0.32.1, the Vala compiler +/* PiwigoPublishing.c generated by valac 0.34.1, the Vala compiler * generated from PiwigoPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -5408,19 +5408,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 5418 "PiwigoPublishing.c" } @@ -8872,7 +8872,7 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = category_name; #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (g_strcmp0 (_tmp21_, "") != 0) { + if (g_strcmp0 (_tmp21_, "") == 0) { #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp20_ = TRUE; #line 8868 "PiwigoPublishing.c" @@ -8979,7 +8979,7 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po gboolean isfirst = FALSE; SpitPublishingPublishable** _tmp7_ = NULL; gint _tmp7__length1 = 0; - const gchar* _tmp18_ = NULL; + const gchar* _tmp19_ = NULL; #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL); #line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9047,7 +9047,8 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po gchar* cur = NULL; SpitPublishingPublishable* _tmp10_ = NULL; gchar* _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + const gchar* _tmp12_ = NULL; + gboolean _tmp13_ = FALSE; #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = pub; #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -9055,70 +9056,82 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po #line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cur = _tmp11_; #line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp12_ = isfirst; + _tmp12_ = cur; #line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp12_) { -#line 9051 "PiwigoPublishing.c" - const gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; -#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp13_ = cur; + if (_tmp12_ == NULL) { #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp14_ = g_strdup (_tmp13_); + _g_free0 (cur); #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (common); + _g_object_unref0 (pub); #line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - common = _tmp14_; -#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - isfirst = FALSE; -#line 9064 "PiwigoPublishing.c" - } else { - const gchar* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; -#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp15_ = cur; + continue; +#line 9058 "PiwigoPublishing.c" + } #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp16_ = common; + _tmp13_ = isfirst; #line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (g_strcmp0 (_tmp15_, _tmp16_) != 0) { -#line 9074 "PiwigoPublishing.c" - gchar* _tmp17_ = NULL; + if (_tmp13_) { +#line 9064 "PiwigoPublishing.c" + const gchar* _tmp14_ = NULL; + gchar* _tmp15_ = NULL; #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp17_ = g_strdup (""); + _tmp14_ = cur; #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (common); + _tmp15_ = g_strdup (_tmp14_); +#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _g_free0 (common); #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - common = _tmp17_; + common = _tmp15_; #line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + isfirst = FALSE; +#line 9077 "PiwigoPublishing.c" + } else { + const gchar* _tmp16_ = NULL; + const gchar* _tmp17_ = NULL; +#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp16_ = cur; +#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp17_ = common; +#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + if (g_strcmp0 (_tmp16_, _tmp17_) != 0) { +#line 9087 "PiwigoPublishing.c" + gchar* _tmp18_ = NULL; +#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp18_ = g_strdup (""); +#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _g_free0 (common); +#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + common = _tmp18_; +#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (cur); -#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (pub); -#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9088 "PiwigoPublishing.c" +#line 9101 "PiwigoPublishing.c" } } #line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (cur); #line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (pub); -#line 9095 "PiwigoPublishing.c" +#line 9108 "PiwigoPublishing.c" } } } } -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp18_ = common; -#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_debug ("PiwigoPublishing.vala:1358: PiwigoConnector: found common event commen" \ -"t %s\n", _tmp18_); -#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp19_ = common; +#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + g_debug ("PiwigoPublishing.vala:1362: PiwigoConnector: found common event commen" \ +"t %s\n", _tmp19_); +#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = common; -#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 9110 "PiwigoPublishing.c" +#line 9123 "PiwigoPublishing.c" } @@ -9129,88 +9142,88 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P gint _tmp5__length1 = 0; const gchar* _tmp21_ = NULL; gboolean _tmp22_ = FALSE; -#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->existing_categories; -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0__length1 = self->priv->existing_categories_length1; -#line 9127 "PiwigoPublishing.c" +#line 9140 "PiwigoPublishing.c" { PublishingPiwigoCategory** cat_collection = NULL; gint cat_collection_length1 = 0; gint _cat_collection_size_ = 0; gint cat_it = 0; -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cat_collection = _tmp0_; -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cat_collection_length1 = _tmp0__length1; -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (cat_it = 0; cat_it < _tmp0__length1; cat_it = cat_it + 1) { -#line 9139 "PiwigoPublishing.c" +#line 9152 "PiwigoPublishing.c" PublishingPiwigoCategory* _tmp1_ = NULL; PublishingPiwigoCategory* cat = NULL; -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]); -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cat = _tmp1_; -#line 9146 "PiwigoPublishing.c" +#line 9159 "PiwigoPublishing.c" { GtkComboBoxText* _tmp2_ = NULL; PublishingPiwigoCategory* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = self->priv->existing_categories_combo; -#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = cat; -#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = _tmp3_->display_name; -#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_text_append_text (_tmp2_, _tmp4_); -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (cat); -#line 9161 "PiwigoPublishing.c" +#line 9174 "PiwigoPublishing.c" } } } -#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = self->priv->existing_categories; -#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5__length1 = self->priv->existing_categories_length1; -#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp5__length1 == 0) { -#line 9171 "PiwigoPublishing.c" +#line 9184 "PiwigoPublishing.c" GtkComboBoxText* _tmp6_ = NULL; GtkRadioButton* _tmp7_ = NULL; GtkRadioButton* _tmp8_ = NULL; GtkTextView* _tmp9_ = NULL; GtkLabel* _tmp10_ = NULL; GtkEntry* _tmp11_ = NULL; -#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = self->priv->existing_categories_combo; -#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = self->priv->use_existing_radio; -#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->create_new_radio; -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); -#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = self->priv->album_comment; -#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = self->priv->album_comment_label; -#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = self->priv->new_category_entry; -#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget)); -#line 9202 "PiwigoPublishing.c" +#line 9215 "PiwigoPublishing.c" } else { gint last_category_index = 0; gint _tmp12_ = 0; @@ -9219,64 +9232,64 @@ static void publishing_piwigo_publishing_options_pane_create_categories_combo (P GtkEntry* _tmp18_ = NULL; GtkTextView* _tmp19_ = NULL; GtkLabel* _tmp20_ = NULL; -#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = self->priv->last_category; -#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp12_); -#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" last_category_index = _tmp13_; -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = last_category_index; -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp14_ < 0) { -#line 9221 "PiwigoPublishing.c" +#line 9234 "PiwigoPublishing.c" GtkComboBoxText* _tmp15_ = NULL; -#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp15_ = self->priv->existing_categories_combo; -#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 9227 "PiwigoPublishing.c" +#line 9240 "PiwigoPublishing.c" } else { GtkComboBoxText* _tmp16_ = NULL; gint _tmp17_ = 0; -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp16_ = self->priv->existing_categories_combo; -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp17_ = last_category_index; -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _tmp17_); -#line 9237 "PiwigoPublishing.c" +#line 9250 "PiwigoPublishing.c" } -#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18_ = self->priv->new_category_entry; -#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19_ = self->priv->album_comment; -#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp20_ = self->priv->album_comment_label; -#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 9251 "PiwigoPublishing.c" +#line 9264 "PiwigoPublishing.c" } -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME; -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp22_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp21_); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp22_) { -#line 9259 "PiwigoPublishing.c" +#line 9272 "PiwigoPublishing.c" GtkEntry* _tmp23_ = NULL; const gchar* _tmp24_ = NULL; -#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp23_ = self->priv->new_category_entry; -#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp24_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME; -#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_entry_set_text (_tmp23_, _tmp24_); -#line 9268 "PiwigoPublishing.c" +#line 9281 "PiwigoPublishing.c" } } @@ -9288,67 +9301,67 @@ static void publishing_piwigo_publishing_options_pane_create_within_categories_c GtkLabel* _tmp6_ = NULL; GtkComboBoxText* _tmp7_ = NULL; GtkComboBoxText* _tmp8_ = NULL; -#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->within_existing_combo; -#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_text_append_text (_tmp0_, "/ "); -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = self->priv->existing_categories; -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1__length1 = self->priv->existing_categories_length1; -#line 9290 "PiwigoPublishing.c" +#line 9303 "PiwigoPublishing.c" { PublishingPiwigoCategory** cat_collection = NULL; gint cat_collection_length1 = 0; gint _cat_collection_size_ = 0; gint cat_it = 0; -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cat_collection = _tmp1_; -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cat_collection_length1 = _tmp1__length1; -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (cat_it = 0; cat_it < _tmp1__length1; cat_it = cat_it + 1) { -#line 9302 "PiwigoPublishing.c" +#line 9315 "PiwigoPublishing.c" PublishingPiwigoCategory* _tmp2_ = NULL; PublishingPiwigoCategory* cat = NULL; -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]); -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" cat = _tmp2_; -#line 9309 "PiwigoPublishing.c" +#line 9322 "PiwigoPublishing.c" { GtkComboBoxText* _tmp3_ = NULL; PublishingPiwigoCategory* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = self->priv->within_existing_combo; -#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = cat; -#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = _tmp4_->display_name; -#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_text_append_text (_tmp3_, _tmp5_); -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (cat); -#line 9324 "PiwigoPublishing.c" +#line 9337 "PiwigoPublishing.c" } } } -#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = self->priv->within_existing_label; -#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = self->priv->within_existing_combo; -#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->within_existing_combo; -#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 9340 "PiwigoPublishing.c" +#line 9353 "PiwigoPublishing.c" } @@ -9359,77 +9372,77 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo ( gint _tmp5_ = 0; gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->perm_levels; -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0__length1 = self->priv->perm_levels_length1; -#line 9357 "PiwigoPublishing.c" +#line 9370 "PiwigoPublishing.c" { PublishingPiwigoPermissionLevel** perm_collection = NULL; gint perm_collection_length1 = 0; gint _perm_collection_size_ = 0; gint perm_it = 0; -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" perm_collection = _tmp0_; -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" perm_collection_length1 = _tmp0__length1; -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) { -#line 9369 "PiwigoPublishing.c" +#line 9382 "PiwigoPublishing.c" PublishingPiwigoPermissionLevel* _tmp1_ = NULL; PublishingPiwigoPermissionLevel* perm = NULL; -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]); -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" perm = _tmp1_; -#line 9376 "PiwigoPublishing.c" +#line 9389 "PiwigoPublishing.c" { GtkComboBoxText* _tmp2_ = NULL; PublishingPiwigoPermissionLevel* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = self->priv->perms_combo; -#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = perm; -#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = _tmp3_->name; -#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_text_append_text (_tmp2_, _tmp4_); -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_permission_level_unref0 (perm); -#line 9391 "PiwigoPublishing.c" +#line 9404 "PiwigoPublishing.c" } } } -#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = self->priv->last_permission_level; -#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_); -#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" last_permission_level_index = _tmp6_; -#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = last_permission_level_index; -#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ < 0) { -#line 9405 "PiwigoPublishing.c" +#line 9418 "PiwigoPublishing.c" GtkComboBoxText* _tmp8_ = NULL; -#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->perms_combo; -#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0); -#line 9411 "PiwigoPublishing.c" +#line 9424 "PiwigoPublishing.c" } else { GtkComboBoxText* _tmp9_ = NULL; gint _tmp10_ = 0; -#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = self->priv->perms_combo; -#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = last_permission_level_index; -#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_); -#line 9421 "PiwigoPublishing.c" +#line 9434 "PiwigoPublishing.c" } } @@ -9441,112 +9454,112 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish gint _tmp5_ = 0; gint _tmp6_ = 0; gint _tmp7_ = 0; -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->photo_sizes; -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0__length1 = self->priv->photo_sizes_length1; -#line 9439 "PiwigoPublishing.c" +#line 9452 "PiwigoPublishing.c" { PublishingPiwigoSizeEntry** size_collection = NULL; gint size_collection_length1 = 0; gint _size_collection_size_ = 0; gint size_it = 0; -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" size_collection = _tmp0_; -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" size_collection_length1 = _tmp0__length1; -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) { -#line 9451 "PiwigoPublishing.c" +#line 9464 "PiwigoPublishing.c" PublishingPiwigoSizeEntry* _tmp1_ = NULL; PublishingPiwigoSizeEntry* size = NULL; -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]); -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" size = _tmp1_; -#line 9458 "PiwigoPublishing.c" +#line 9471 "PiwigoPublishing.c" { GtkComboBoxText* _tmp2_ = NULL; PublishingPiwigoSizeEntry* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = self->priv->size_combo; -#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = size; -#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = _tmp3_->name; -#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_text_append_text (_tmp2_, _tmp4_); -#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_size_entry_unref0 (size); -#line 9473 "PiwigoPublishing.c" +#line 9486 "PiwigoPublishing.c" } } } -#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = self->priv->last_photo_size; -#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_); -#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" last_size_index = _tmp6_; -#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = last_size_index; -#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ < 0) { -#line 9487 "PiwigoPublishing.c" +#line 9500 "PiwigoPublishing.c" GtkComboBoxText* _tmp8_ = NULL; gint _tmp9_ = 0; -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = self->priv->size_combo; -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE); -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_); -#line 9496 "PiwigoPublishing.c" +#line 9509 "PiwigoPublishing.c" } else { GtkComboBoxText* _tmp10_ = NULL; gint _tmp11_ = 0; -#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = self->priv->size_combo; -#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = last_size_index; -#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_); -#line 9506 "PiwigoPublishing.c" +#line 9519 "PiwigoPublishing.c" } } static void publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingPiwigoPublishingOptionsPane * self; -#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane); -#line 9515 "PiwigoPublishing.c" +#line 9528 "PiwigoPublishing.c" } static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id) { gint result = 0; gint _result_ = 0; -#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); -#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = -1; -#line 9526 "PiwigoPublishing.c" +#line 9539 "PiwigoPublishing.c" { gint i = 0; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = 0; -#line 9531 "PiwigoPublishing.c" +#line 9544 "PiwigoPublishing.c" { gboolean _tmp0_ = FALSE; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = TRUE; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 9538 "PiwigoPublishing.c" +#line 9551 "PiwigoPublishing.c" gint _tmp2_ = 0; PublishingPiwigoCategory** _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -9556,85 +9569,85 @@ static gint publishing_piwigo_publishing_options_pane_find_category_index (Publi PublishingPiwigoCategory* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp0_) { -#line 9550 "PiwigoPublishing.c" +#line 9563 "PiwigoPublishing.c" gint _tmp1_ = 0; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = i; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = _tmp1_ + 1; -#line 9556 "PiwigoPublishing.c" +#line 9569 "PiwigoPublishing.c" } -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = i; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = self->priv->existing_categories; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3__length1 = self->priv->existing_categories_length1; -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!(_tmp2_ < _tmp3__length1)) { -#line 1430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9570 "PiwigoPublishing.c" +#line 9583 "PiwigoPublishing.c" } -#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->existing_categories; -#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4__length1 = self->priv->existing_categories_length1; -#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = i; -#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _tmp4_[_tmp5_]; -#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _tmp6_->id; -#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = category_id; -#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ == _tmp8_) { -#line 9586 "PiwigoPublishing.c" +#line 9599 "PiwigoPublishing.c" gint _tmp9_ = 0; -#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = i; -#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = _tmp9_; -#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9594 "PiwigoPublishing.c" +#line 9607 "PiwigoPublishing.c" } } } } -#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _result_; -#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 9603 "PiwigoPublishing.c" +#line 9616 "PiwigoPublishing.c" } static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id) { gint result = 0; gint _result_ = 0; -#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); -#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = -1; -#line 9614 "PiwigoPublishing.c" +#line 9627 "PiwigoPublishing.c" { gint i = 0; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = 0; -#line 9619 "PiwigoPublishing.c" +#line 9632 "PiwigoPublishing.c" { gboolean _tmp0_ = FALSE; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = TRUE; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 9626 "PiwigoPublishing.c" +#line 9639 "PiwigoPublishing.c" gint _tmp2_ = 0; PublishingPiwigoPermissionLevel** _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -9644,85 +9657,85 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde PublishingPiwigoPermissionLevel* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp0_) { -#line 9638 "PiwigoPublishing.c" +#line 9651 "PiwigoPublishing.c" gint _tmp1_ = 0; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = i; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = _tmp1_ + 1; -#line 9644 "PiwigoPublishing.c" +#line 9657 "PiwigoPublishing.c" } -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = i; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = self->priv->perm_levels; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3__length1 = self->priv->perm_levels_length1; -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!(_tmp2_ < _tmp3__length1)) { -#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9658 "PiwigoPublishing.c" +#line 9671 "PiwigoPublishing.c" } -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->perm_levels; -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4__length1 = self->priv->perm_levels_length1; -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = i; -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _tmp4_[_tmp5_]; -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _tmp6_->id; -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = permission_level_id; -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ == _tmp8_) { -#line 9674 "PiwigoPublishing.c" +#line 9687 "PiwigoPublishing.c" gint _tmp9_ = 0; -#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = i; -#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = _tmp9_; -#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9682 "PiwigoPublishing.c" +#line 9695 "PiwigoPublishing.c" } } } } -#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _result_; -#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 9691 "PiwigoPublishing.c" +#line 9704 "PiwigoPublishing.c" } static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id) { gint result = 0; gint _result_ = 0; -#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0); -#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = -1; -#line 9702 "PiwigoPublishing.c" +#line 9715 "PiwigoPublishing.c" { gint i = 0; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = 0; -#line 9707 "PiwigoPublishing.c" +#line 9720 "PiwigoPublishing.c" { gboolean _tmp0_ = FALSE; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = TRUE; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" while (TRUE) { -#line 9714 "PiwigoPublishing.c" +#line 9727 "PiwigoPublishing.c" gint _tmp2_ = 0; PublishingPiwigoSizeEntry** _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -9732,62 +9745,62 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin PublishingPiwigoSizeEntry* _tmp6_ = NULL; gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp0_) { -#line 9726 "PiwigoPublishing.c" +#line 9739 "PiwigoPublishing.c" gint _tmp1_ = 0; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = i; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" i = _tmp1_ + 1; -#line 9732 "PiwigoPublishing.c" +#line 9745 "PiwigoPublishing.c" } -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = i; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = self->priv->photo_sizes; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3__length1 = self->priv->photo_sizes_length1; -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!(_tmp2_ < _tmp3__length1)) { -#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9746 "PiwigoPublishing.c" +#line 9759 "PiwigoPublishing.c" } -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->photo_sizes; -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4__length1 = self->priv->photo_sizes_length1; -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = i; -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _tmp4_[_tmp5_]; -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _tmp6_->id; -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = size_id; -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_ == _tmp8_) { -#line 9762 "PiwigoPublishing.c" +#line 9775 "PiwigoPublishing.c" gint _tmp9_ = 0; -#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = i; -#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = _tmp9_; -#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9770 "PiwigoPublishing.c" +#line 9783 "PiwigoPublishing.c" } } } } -#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _result_; -#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 9779 "PiwigoPublishing.c" +#line 9792 "PiwigoPublishing.c" } @@ -9796,36 +9809,36 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist gboolean _result_ = FALSE; PublishingPiwigoCategory** _tmp0_ = NULL; gint _tmp0__length1 = 0; -#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE); -#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (category_name != NULL, FALSE); -#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = FALSE; -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->existing_categories; -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0__length1 = self->priv->existing_categories_length1; -#line 9798 "PiwigoPublishing.c" +#line 9811 "PiwigoPublishing.c" { PublishingPiwigoCategory** category_collection = NULL; gint category_collection_length1 = 0; gint _category_collection_size_ = 0; gint category_it = 0; -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" category_collection = _tmp0_; -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" category_collection_length1 = _tmp0__length1; -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" for (category_it = 0; category_it < _tmp0__length1; category_it = category_it + 1) { -#line 9810 "PiwigoPublishing.c" +#line 9823 "PiwigoPublishing.c" PublishingPiwigoCategory* _tmp1_ = NULL; PublishingPiwigoCategory* category = NULL; -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _publishing_piwigo_category_ref0 (category_collection[category_it]); -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" category = _tmp1_; -#line 9817 "PiwigoPublishing.c" +#line 9830 "PiwigoPublishing.c" { PublishingPiwigoCategory* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; @@ -9833,41 +9846,41 @@ static gboolean publishing_piwigo_publishing_options_pane_category_already_exist gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = category; -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = _tmp2_->display_name; -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = string_strip (_tmp3_); -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = _tmp4_; -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = category_name; -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0; -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp5_); -#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp7_) { -#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _result_ = TRUE; -#line 1466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (category); -#line 1466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" break; -#line 9847 "PiwigoPublishing.c" +#line 9860 "PiwigoPublishing.c" } -#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_category_unref0 (category); -#line 9851 "PiwigoPublishing.c" +#line 9864 "PiwigoPublishing.c" } } } -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _result_; -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 9859 "PiwigoPublishing.c" +#line 9872 "PiwigoPublishing.c" } @@ -9886,19 +9899,19 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER data1 = closure->data; #line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 9878 "PiwigoPublishing.c" +#line 9891 "PiwigoPublishing.c" } else { #line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data1 = param_values->data[0].v_pointer; #line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" data2 = closure->data; -#line 9884 "PiwigoPublishing.c" +#line 9897 "PiwigoPublishing.c" } #line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2); -#line 9890 "PiwigoPublishing.c" +#line 9903 "PiwigoPublishing.c" } @@ -9921,7 +9934,7 @@ static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwi _tmp1_ = g_strdup (_tmp0_); #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp1_; -#line 9913 "PiwigoPublishing.c" +#line 9926 "PiwigoPublishing.c" } @@ -9936,7 +9949,7 @@ static void publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pan iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_installed; #line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled; -#line 9928 "PiwigoPublishing.c" +#line 9941 "PiwigoPublishing.c" } @@ -9951,7 +9964,7 @@ static void publishing_piwigo_publishing_options_pane_instance_init (PublishingP self->priv->title_as_comment_check = NULL; #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->no_upload_tags_check = NULL; -#line 9943 "PiwigoPublishing.c" +#line 9956 "PiwigoPublishing.c" } @@ -10001,7 +10014,7 @@ static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) { self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL); #line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj); -#line 9993 "PiwigoPublishing.c" +#line 10006 "PiwigoPublishing.c" } @@ -10024,18 +10037,18 @@ GType publishing_piwigo_publishing_options_pane_get_type (void) { PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type) { PublishingPiwigoSession* self = NULL; -#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, ""); -#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10020 "PiwigoPublishing.c" +#line 10033 "PiwigoPublishing.c" } PublishingPiwigoSession* publishing_piwigo_session_new (void) { -#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION); -#line 10027 "PiwigoPublishing.c" +#line 10040 "PiwigoPublishing.c" } @@ -10045,43 +10058,43 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; const gchar* _tmp2_ = NULL; -#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession); -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = self->priv->pwg_id; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp2_ != NULL) { -#line 10043 "PiwigoPublishing.c" +#line 10056 "PiwigoPublishing.c" const gchar* _tmp3_ = NULL; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = self->priv->pwg_url; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = _tmp3_ != NULL; -#line 10049 "PiwigoPublishing.c" +#line 10062 "PiwigoPublishing.c" } else { -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = FALSE; -#line 10053 "PiwigoPublishing.c" +#line 10066 "PiwigoPublishing.c" } -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp1_) { -#line 10057 "PiwigoPublishing.c" +#line 10070 "PiwigoPublishing.c" const gchar* _tmp4_ = NULL; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = self->priv->username; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = _tmp4_ != NULL; -#line 10063 "PiwigoPublishing.c" +#line 10076 "PiwigoPublishing.c" } else { -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = FALSE; -#line 10067 "PiwigoPublishing.c" +#line 10080 "PiwigoPublishing.c" } -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp0_; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10073 "PiwigoPublishing.c" +#line 10086 "PiwigoPublishing.c" } @@ -10092,58 +10105,58 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self)); -#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (url != NULL); -#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (username != NULL); -#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (id != NULL); -#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = url; -#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->pwg_url); -#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_url = _tmp1_; -#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = username; -#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->username); -#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->username = _tmp3_; -#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = id; -#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = g_strdup (_tmp4_); -#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->pwg_id); -#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_id = _tmp5_; -#line 10116 "PiwigoPublishing.c" +#line 10129 "PiwigoPublishing.c" } void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) { -#line 1498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self)); -#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->pwg_url); -#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_url = NULL; -#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->pwg_id); -#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_id = NULL; -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->username); -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->username = NULL; -#line 10135 "PiwigoPublishing.c" +#line 10148 "PiwigoPublishing.c" } @@ -10151,17 +10164,17 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL); -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->username; -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp1_; -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10153 "PiwigoPublishing.c" +#line 10166 "PiwigoPublishing.c" } @@ -10169,17 +10182,17 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL); -#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->pwg_url; -#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp1_; -#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10171 "PiwigoPublishing.c" +#line 10184 "PiwigoPublishing.c" } @@ -10187,78 +10200,78 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL); -#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = self->priv->pwg_id; -#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp1_; -#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10189 "PiwigoPublishing.c" +#line 10202 "PiwigoPublishing.c" } void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) { const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self)); -#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_if_fail (id != NULL); -#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = id; -#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->pwg_id); -#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_id = _tmp1_; -#line 10208 "PiwigoPublishing.c" +#line 10221 "PiwigoPublishing.c" } static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass) { -#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_session_parent_class = g_type_class_peek_parent (klass); -#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_piwigo_session_finalize; -#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate)); -#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_piwigo_session_real_is_authenticated; -#line 10221 "PiwigoPublishing.c" +#line 10234 "PiwigoPublishing.c" } static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * self) { -#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv = PUBLISHING_PIWIGO_SESSION_GET_PRIVATE (self); -#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_url = NULL; -#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->pwg_id = NULL; -#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->username = NULL; -#line 10234 "PiwigoPublishing.c" +#line 10247 "PiwigoPublishing.c" } static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj) { PublishingPiwigoSession * self; -#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession); -#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->pwg_url); -#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->pwg_id); -#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (self->priv->username); -#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj); -#line 10250 "PiwigoPublishing.c" +#line 10263 "PiwigoPublishing.c" } @@ -10283,52 +10296,52 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje PublishingPiwigoSession* _tmp0_ = NULL; PublishingPiwigoSession* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); -#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = session; -#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp2_) { -#line 10287 "PiwigoPublishing.c" +#line 10300 "PiwigoPublishing.c" PublishingPiwigoSession* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = session; -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = publishing_piwigo_session_get_pwg_id (_tmp3_); -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = _tmp4_; -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = g_strconcat ("pwg_id=", _tmp5_, NULL); -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _tmp6_; -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp7_); -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp7_); -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp5_); -#line 10309 "PiwigoPublishing.c" +#line 10322 "PiwigoPublishing.c" } -#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10313 "PiwigoPublishing.c" +#line 10326 "PiwigoPublishing.c" } PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) { -#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session); -#line 10320 "PiwigoPublishing.c" +#line 10333 "PiwigoPublishing.c" } @@ -10343,46 +10356,46 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticat gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = session; -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = publishing_piwigo_session_get_pwg_url (_tmp1_); -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = _tmp2_; -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp3_); -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = session; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_); -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _tmp5_; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = g_strconcat ("pwg_id=", _tmp6_, NULL); -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = _tmp7_; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp8_); -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp8_); -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp6_); -#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10367 "PiwigoPublishing.c" +#line 10380 "PiwigoPublishing.c" } PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) { -#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session); -#line 10374 "PiwigoPublishing.c" +#line 10387 "PiwigoPublishing.c" } @@ -10406,143 +10419,143 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum gchar* _tmp18_ = NULL; gchar* _tmp19_ = NULL; GError * _inner_error_ = NULL; -#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = doc; -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_); -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" root = _tmp1_; -#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = root; -#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat"); -#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" status = _tmp3_; -#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = status; -#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp4_ == NULL) { -#line 10416 "PiwigoPublishing.c" +#line 10429 "PiwigoPublishing.c" gchar* _tmp5_ = NULL; -#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = g_strdup ("No status property in root node"); -#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp5_; -#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (status); -#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10426 "PiwigoPublishing.c" +#line 10439 "PiwigoPublishing.c" } -#line 1550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = status; -#line 1550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp6_, "ok") == 0) { -#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = NULL; -#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (status); -#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10438 "PiwigoPublishing.c" +#line 10451 "PiwigoPublishing.c" } { xmlNode* _tmp7_ = NULL; PublishingRESTSupportXmlDocument* _tmp8_ = NULL; xmlNode* _tmp9_ = NULL; xmlNode* _tmp10_ = NULL; -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = doc; -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = root; -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_); -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = _tmp10_; -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 10457 "PiwigoPublishing.c" +#line 10470 "PiwigoPublishing.c" goto __catch46_spit_publishing_publishing_error; } -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (status); -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_clear_error (&_inner_error_); -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 10468 "PiwigoPublishing.c" +#line 10481 "PiwigoPublishing.c" } -#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" errcode = _tmp7_; -#line 10472 "PiwigoPublishing.c" +#line 10485 "PiwigoPublishing.c" } goto __finally46; __catch46_spit_publishing_publishing_error: { GError* err = NULL; gchar* _tmp11_ = NULL; -#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; -#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _inner_error_ = NULL; -#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = g_strdup ("No error code specified"); -#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp11_; -#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (status); -#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10493 "PiwigoPublishing.c" +#line 10506 "PiwigoPublishing.c" } __finally46: -#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (status); -#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_clear_error (&_inner_error_); -#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 10506 "PiwigoPublishing.c" +#line 10519 "PiwigoPublishing.c" } -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = errcode; -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg"); -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = _tmp13_; -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp15_ = errcode; -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code"); -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp17_ = _tmp16_; -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_); -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19_ = _tmp18_; -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp17_); -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp14_); -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp19_; -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (status); -#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10534 "PiwigoPublishing.c" +#line 10547 "PiwigoPublishing.c" } @@ -10555,93 +10568,93 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc xmlNode* _tmp7_ = NULL; gchar* _tmp8_ = NULL; GError * _inner_error_ = NULL; -#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); -#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = doc; -#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_); -#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" root = _tmp1_; -#line 10555 "PiwigoPublishing.c" +#line 10568 "PiwigoPublishing.c" { xmlNode* _tmp2_ = NULL; PublishingRESTSupportXmlDocument* _tmp3_ = NULL; xmlNode* _tmp4_ = NULL; xmlNode* _tmp5_ = NULL; -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = doc; -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = root; -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "err", &_inner_error_); -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = _tmp5_; -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 10573 "PiwigoPublishing.c" +#line 10586 "PiwigoPublishing.c" goto __catch47_spit_publishing_publishing_error; } -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_clear_error (&_inner_error_); -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 10582 "PiwigoPublishing.c" +#line 10595 "PiwigoPublishing.c" } -#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" errcode = _tmp2_; -#line 10586 "PiwigoPublishing.c" +#line 10599 "PiwigoPublishing.c" } goto __finally47; __catch47_spit_publishing_publishing_error: { GError* err = NULL; gchar* _tmp6_ = NULL; -#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" err = _inner_error_; -#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _inner_error_ = NULL; -#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = g_strdup ("0"); -#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp6_; -#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_error_free0 (err); -#line 1569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10605 "PiwigoPublishing.c" +#line 10618 "PiwigoPublishing.c" } __finally47: -#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_clear_error (&_inner_error_); -#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return NULL; -#line 10616 "PiwigoPublishing.c" +#line 10629 "PiwigoPublishing.c" } -#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = errcode; -#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = (gchar*) xmlGetProp (_tmp7_, (xmlChar*) "code"); -#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" result = _tmp8_; -#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return result; -#line 10626 "PiwigoPublishing.c" +#line 10639 "PiwigoPublishing.c" } static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) { -#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10633 "PiwigoPublishing.c" +#line 10646 "PiwigoPublishing.c" } @@ -10675,47 +10688,47 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (username != NULL, NULL); -#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (password != NULL, NULL); -#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = url; -#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); -#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.login"); -#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = username; -#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp2_); -#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = password; -#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_); -#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10693 "PiwigoPublishing.c" +#line 10706 "PiwigoPublishing.c" } PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) { -#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password); -#line 10700 "PiwigoPublishing.c" +#line 10713 "PiwigoPublishing.c" } static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) { -#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10707 "PiwigoPublishing.c" +#line 10720 "PiwigoPublishing.c" } @@ -10747,77 +10760,77 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (pwg_id != NULL, NULL); -#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = url; -#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = session; -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = publishing_piwigo_session_get_pwg_id (_tmp2_); -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = _tmp3_; -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = g_strconcat ("pwg_id=", _tmp4_, NULL); -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = _tmp5_; -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp6_); -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp6_); -#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp4_); -#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus"); -#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10771 "PiwigoPublishing.c" +#line 10784 "PiwigoPublishing.c" } PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) { -#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id); -#line 10778 "PiwigoPublishing.c" +#line 10791 "PiwigoPublishing.c" } PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoSessionGetStatusTransaction* self = NULL; PublishingPiwigoSession* _tmp0_ = NULL; -#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_); -#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus"); -#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10795 "PiwigoPublishing.c" +#line 10808 "PiwigoPublishing.c" } PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) { -#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session); -#line 10802 "PiwigoPublishing.c" +#line 10815 "PiwigoPublishing.c" } static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) { -#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10809 "PiwigoPublishing.c" +#line 10822 "PiwigoPublishing.c" } @@ -10843,33 +10856,33 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) { PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoCategoriesGetListTransaction* self = NULL; PublishingPiwigoSession* _tmp0_ = NULL; -#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_); -#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.getList"); -#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true"); -#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10847 "PiwigoPublishing.c" +#line 10860 "PiwigoPublishing.c" } PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) { -#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session); -#line 10854 "PiwigoPublishing.c" +#line 10867 "PiwigoPublishing.c" } static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) { -#line 1609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10861 "PiwigoPublishing.c" +#line 10874 "PiwigoPublishing.c" } @@ -10895,31 +10908,31 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) { PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) { PublishingPiwigoSessionLogoutTransaction* self = NULL; PublishingPiwigoSession* _tmp0_ = NULL; -#line 1619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_); -#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout"); -#line 1619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10897 "PiwigoPublishing.c" +#line 10910 "PiwigoPublishing.c" } PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) { -#line 1619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session); -#line 10904 "PiwigoPublishing.c" +#line 10917 "PiwigoPublishing.c" } static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) { -#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10911 "PiwigoPublishing.c" +#line 10924 "PiwigoPublishing.c" } @@ -10945,69 +10958,69 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans const gchar* _tmp1_ = NULL; gint _tmp2_ = 0; const gchar* _tmp6_ = NULL; -#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (category != NULL, NULL); -#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_); -#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.add"); -#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = category; -#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp1_); -#line 1633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = parent_id; -#line 1633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp2_ != 0) { -#line 10955 "PiwigoPublishing.c" +#line 10968 "PiwigoPublishing.c" gint _tmp3_ = 0; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = parent_id; -#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = g_strdup_printf ("%i", _tmp3_); -#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = _tmp4_; -#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_); -#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp5_); -#line 10969 "PiwigoPublishing.c" +#line 10982 "PiwigoPublishing.c" } -#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = comment; -#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp6_, "") != 0) { -#line 10975 "PiwigoPublishing.c" +#line 10988 "PiwigoPublishing.c" const gchar* _tmp7_ = NULL; -#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = comment; -#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_); -#line 10981 "PiwigoPublishing.c" +#line 10994 "PiwigoPublishing.c" } -#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 10985 "PiwigoPublishing.c" +#line 10998 "PiwigoPublishing.c" } PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) { -#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment); -#line 10992 "PiwigoPublishing.c" +#line 11005 "PiwigoPublishing.c" } static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) { -#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10999 "PiwigoPublishing.c" +#line 11012 "PiwigoPublishing.c" } @@ -11034,74 +11047,74 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gboolean _tmp2_ = FALSE; gchar** _tmp3_ = NULL; gint _tmp3__length1 = 0; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = separator; -#line 1054 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_ == NULL) { -#line 1055 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; -#line 11032 "PiwigoPublishing.c" +#line 11045 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 11042 "PiwigoPublishing.c" +#line 11055 "PiwigoPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 11052 "PiwigoPublishing.c" +#line 11065 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 11058 "PiwigoPublishing.c" +#line 11071 "PiwigoPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 11069 "PiwigoPublishing.c" +#line 11082 "PiwigoPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 11081 "PiwigoPublishing.c" +#line 11094 "PiwigoPublishing.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 11085 "PiwigoPublishing.c" +#line 11098 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 11089 "PiwigoPublishing.c" +#line 11102 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 11093 "PiwigoPublishing.c" +#line 11106 "PiwigoPublishing.c" gint i = 0; gsize len = 0UL; gint _tmp31_ = 0; @@ -11122,18 +11135,18 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp44_ = NULL; void* _tmp45_ = NULL; const gchar* _tmp62_ = NULL; -#line 1059 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 11116 "PiwigoPublishing.c" +#line 11129 "PiwigoPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { -#line 11125 "PiwigoPublishing.c" +#line 11138 "PiwigoPublishing.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; gchar** _tmp13_ = NULL; @@ -11144,192 +11157,192 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gint _tmp23_ = 0; const gchar* _tmp24_ = NULL; gsize _tmp30_ = 0UL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 11138 "PiwigoPublishing.c" +#line 11151 "PiwigoPublishing.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 11144 "PiwigoPublishing.c" +#line 11157 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 11154 "PiwigoPublishing.c" +#line 11167 "PiwigoPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 11166 "PiwigoPublishing.c" +#line 11179 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 11170 "PiwigoPublishing.c" +#line 11183 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 11176 "PiwigoPublishing.c" +#line 11189 "PiwigoPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 11187 "PiwigoPublishing.c" +#line 11200 "PiwigoPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 11202 "PiwigoPublishing.c" +#line 11215 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 11206 "PiwigoPublishing.c" +#line 11219 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 11210 "PiwigoPublishing.c" +#line 11223 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; -#line 11216 "PiwigoPublishing.c" +#line 11229 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 11228 "PiwigoPublishing.c" +#line 11241 "PiwigoPublishing.c" gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; gint _tmp26_ = 0; const gchar* _tmp27_ = NULL; gint _tmp28_ = 0; gint _tmp29_ = 0; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp25__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp26_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp27_ = _tmp25_[_tmp26_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp28_ = strlen ((const gchar*) _tmp27_); -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp29_ = _tmp28_; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 11249 "PiwigoPublishing.c" +#line 11262 "PiwigoPublishing.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 11253 "PiwigoPublishing.c" +#line 11266 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 11259 "PiwigoPublishing.c" +#line 11272 "PiwigoPublishing.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 11266 "PiwigoPublishing.c" +#line 11279 "PiwigoPublishing.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 11274 "PiwigoPublishing.c" +#line 11287 "PiwigoPublishing.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 11312 "PiwigoPublishing.c" +#line 11325 "PiwigoPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { -#line 11321 "PiwigoPublishing.c" +#line 11334 "PiwigoPublishing.c" gint _tmp48_ = 0; gchar** _tmp49_ = NULL; gint _tmp49__length1 = 0; @@ -11343,104 +11356,104 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp56_ = NULL; void* _tmp60_ = NULL; void* _tmp61_ = NULL; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 11337 "PiwigoPublishing.c" +#line 11350 "PiwigoPublishing.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 11343 "PiwigoPublishing.c" +#line 11356 "PiwigoPublishing.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; -#line 11357 "PiwigoPublishing.c" +#line 11370 "PiwigoPublishing.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 11377 "PiwigoPublishing.c" +#line 11390 "PiwigoPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 11392 "PiwigoPublishing.c" +#line 11405 "PiwigoPublishing.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 11396 "PiwigoPublishing.c" +#line 11409 "PiwigoPublishing.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 11404 "PiwigoPublishing.c" +#line 11417 "PiwigoPublishing.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 11415 "PiwigoPublishing.c" +#line 11428 "PiwigoPublishing.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 11424 "PiwigoPublishing.c" +#line 11437 "PiwigoPublishing.c" } } static void _g_free0_ (gpointer var) { -#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" var = (g_free (var), NULL); -#line 11432 "PiwigoPublishing.c" +#line 11445 "PiwigoPublishing.c" } @@ -11506,381 +11519,381 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c gchar* _tmp74_ = NULL; gchar* _tmp75_ = NULL; gchar* _tmp76_ = NULL; -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp0_ = session; -#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp1_ = publishable; -#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp2_ = session; -#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp3_ = publishing_piwigo_session_get_pwg_url (_tmp2_); -#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp4_ = _tmp3_; -#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_); -#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp4_); -#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp5_ = session; -#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); -#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp6_) { -#line 11524 "PiwigoPublishing.c" +#line 11537 "PiwigoPublishing.c" PublishingPiwigoSession* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7_ = session; -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8_ = publishing_piwigo_session_get_pwg_id (_tmp7_); -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9_ = _tmp8_; -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp10_ = g_strconcat ("pwg_id=", _tmp9_, NULL); -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp11_ = _tmp10_; -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp11_); -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp11_); -#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp9_); -#line 11546 "PiwigoPublishing.c" +#line 11559 "PiwigoPublishing.c" } -#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = parameters; -#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp13_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp12_); -#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters); -#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->parameters = _tmp13_; -#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp14_ = publishable; -#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp16_ = spit_publishing_publishable_get_publishing_keywords (_tmp14_, &_tmp15_); -#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" keywords = _tmp16_; -#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" keywords_length1 = _tmp15_; -#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _keywords_size_ = keywords_length1; -#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp17_ = g_strdup (""); -#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" tags = _tmp17_; -#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18_ = keywords; -#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp18__length1 = keywords_length1; -#line 1655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp18_ != NULL) { -#line 11576 "PiwigoPublishing.c" +#line 11589 "PiwigoPublishing.c" gchar** _tmp19_ = NULL; gint _tmp19__length1 = 0; gchar* _tmp20_ = NULL; -#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19_ = keywords; -#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp19__length1 = keywords_length1; -#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp20_ = _vala_g_strjoinv (",", _tmp19_, _tmp19__length1); -#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (tags); -#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" tags = _tmp20_; -#line 11590 "PiwigoPublishing.c" +#line 11603 "PiwigoPublishing.c" } -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = publishable; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp22_ = spit_publishing_publishable_get_serialized_file (_tmp21_); -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp23_ = _tmp22_; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp24_ = g_file_get_basename (_tmp23_); -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp25_ = _tmp24_; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp26_ = parameters; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp27_ = _tmp26_->category; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp28_ = _tmp27_->id; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp29_ = parameters; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp30_ = _tmp29_->perm_level; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp31_ = _tmp30_->id; -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_debug ("PiwigoPublishing.vala:1659: PiwigoConnector: Uploading photo %s to cat" \ +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + g_debug ("PiwigoPublishing.vala:1663: PiwigoConnector: Uploading photo %s to cat" \ "egory id %d with perm level %d", _tmp25_, _tmp28_, _tmp31_); -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp25_); -#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_object_unref0 (_tmp23_); -#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp32_ = publishable; -#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp33_ = spit_publishing_publishable_get_publishing_name (_tmp32_); -#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" name = _tmp33_; -#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp34_ = publishable; -#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp35_ = spit_publishing_publishable_get_param_string (_tmp34_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT); -#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" comment = _tmp35_; -#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp36_ = name; -#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp36_, "") != 0) { -#line 11636 "PiwigoPublishing.c" +#line 11649 "PiwigoPublishing.c" SpitPublishingPublishable* _tmp37_ = NULL; gchar* _tmp38_ = NULL; const gchar* _tmp39_ = NULL; gboolean _tmp40_ = FALSE; const gchar* _tmp41_ = NULL; -#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp37_ = publishable; -#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp38_ = spit_publishing_publishable_get_param_string (_tmp37_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (name); -#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" name = _tmp38_; -#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp39_ = name; -#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_); -#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp41_ = comment; -#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp41_ != NULL) { -#line 11658 "PiwigoPublishing.c" +#line 11671 "PiwigoPublishing.c" const gchar* _tmp42_ = NULL; -#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp42_ = comment; -#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp40_ = g_strcmp0 (_tmp42_, "") != 0; -#line 11664 "PiwigoPublishing.c" +#line 11677 "PiwigoPublishing.c" } else { -#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp40_ = FALSE; -#line 11668 "PiwigoPublishing.c" +#line 11681 "PiwigoPublishing.c" } -#line 1669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp40_) { -#line 11672 "PiwigoPublishing.c" +#line 11685 "PiwigoPublishing.c" const gchar* _tmp43_ = NULL; -#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp43_ = comment; -#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp43_); -#line 11678 "PiwigoPublishing.c" +#line 11691 "PiwigoPublishing.c" } } else { gboolean _tmp44_ = FALSE; const gchar* _tmp45_ = NULL; -#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp45_ = comment; -#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp45_ != NULL) { -#line 11687 "PiwigoPublishing.c" +#line 11700 "PiwigoPublishing.c" const gchar* _tmp46_ = NULL; -#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp46_ = comment; -#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp44_ = g_strcmp0 (_tmp46_, "") != 0; -#line 11693 "PiwigoPublishing.c" +#line 11706 "PiwigoPublishing.c" } else { -#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp44_ = FALSE; -#line 11697 "PiwigoPublishing.c" +#line 11710 "PiwigoPublishing.c" } -#line 1674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp44_) { -#line 11701 "PiwigoPublishing.c" +#line 11714 "PiwigoPublishing.c" const gchar* _tmp47_ = NULL; const gchar* _tmp48_ = NULL; -#line 1675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp47_ = name; -#line 1675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp47_); -#line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp48_ = comment; -#line 1676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp48_); -#line 11712 "PiwigoPublishing.c" +#line 11725 "PiwigoPublishing.c" } else { PublishingPiwigoPublishingParameters* _tmp49_ = NULL; gboolean _tmp50_ = FALSE; -#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp49_ = parameters; -#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp50_ = _tmp49_->title_as_comment; -#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp50_) { -#line 11722 "PiwigoPublishing.c" +#line 11735 "PiwigoPublishing.c" const gchar* _tmp51_ = NULL; -#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp51_ = name; -#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp51_); -#line 11728 "PiwigoPublishing.c" +#line 11741 "PiwigoPublishing.c" } else { const gchar* _tmp52_ = NULL; -#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp52_ = name; -#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp52_); -#line 11735 "PiwigoPublishing.c" +#line 11748 "PiwigoPublishing.c" } } } -#line 1688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple"); -#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp53_ = parameters; -#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp54_ = _tmp53_->category; -#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp55_ = _tmp54_->id; -#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp56_ = g_strdup_printf ("%i", _tmp55_); -#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp57_ = _tmp56_; -#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp57_); -#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp57_); -#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp58_ = parameters; -#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp59_ = _tmp58_->perm_level; -#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp60_ = _tmp59_->id; -#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp61_ = g_strdup_printf ("%i", _tmp60_); -#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp62_ = _tmp61_; -#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp62_); -#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp62_); -#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp63_ = parameters; -#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp64_ = _tmp63_->no_upload_tags; -#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (!_tmp64_) { -#line 11775 "PiwigoPublishing.c" +#line 11788 "PiwigoPublishing.c" const gchar* _tmp65_ = NULL; -#line 1692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp65_ = tags; -#line 1692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (g_strcmp0 (_tmp65_, "") != 0) { -#line 11781 "PiwigoPublishing.c" +#line 11794 "PiwigoPublishing.c" const gchar* _tmp66_ = NULL; -#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp66_ = tags; -#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp66_); -#line 11787 "PiwigoPublishing.c" +#line 11800 "PiwigoPublishing.c" } } -#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp67_ = g_str_hash; -#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp68_ = g_str_equal; -#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp69_ = g_hash_table_new_full (_tmp67_, _tmp68_, _g_free0_, _g_free0_); -#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" disposition_table = _tmp69_; -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp70_ = g_strdup ("filename"); -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp71_ = publishable; -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp72_ = spit_publishing_publishable_get_param_string (_tmp71_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp73_ = _tmp72_; -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp74_ = soup_uri_encode (_tmp73_, NULL); -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_hash_table_insert (disposition_table, _tmp70_, _tmp74_); -#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp73_); -#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp75_ = g_strdup ("name"); -#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp76_ = g_strdup ("image"); -#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_hash_table_insert (disposition_table, _tmp75_, _tmp76_); -#line 1710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_hash_table_unref0 (disposition_table); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (comment); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (name); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (tags); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 11832 "PiwigoPublishing.c" +#line 11845 "PiwigoPublishing.c" } PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) { -#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable); -#line 11839 "PiwigoPublishing.c" +#line 11852 "PiwigoPublishing.c" } static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass) { -#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_piwigo_images_add_transaction_parent_class = g_type_class_peek_parent (klass); -#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize; -#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate)); -#line 11850 "PiwigoPublishing.c" +#line 11863 "PiwigoPublishing.c" } static void publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self) { -#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self); -#line 1644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->parameters = NULL; -#line 11859 "PiwigoPublishing.c" +#line 11872 "PiwigoPublishing.c" } static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj) { PublishingPiwigoImagesAddTransaction * self; -#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction); -#line 1644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters); -#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" +#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj); -#line 11871 "PiwigoPublishing.c" +#line 11884 "PiwigoPublishing.c" } diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala index c3a1bd0..63623ea 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.vala +++ b/plugins/shotwell-publishing/PiwigoPublishing.vala @@ -1309,7 +1309,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object { !( create_new_radio.get_active() && ( - category_name != "" || + category_name == "" || category_already_exists(search_name) ) ) @@ -1342,8 +1342,12 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object { bool isfirst = true; if (publishables != null) { foreach (Spit.Publishing.Publishable pub in publishables) { - string cur = pub.get_param_string( + string? cur = pub.get_param_string( Spit.Publishing.Publishable.PARAM_STRING_EVENTCOMMENT); + if (cur == null) { + continue; + } + if (isfirst) { common = cur; isfirst = false; diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c index cc7cd07..ed78ff1 100644 --- a/plugins/shotwell-publishing/YouTubePublishing.c +++ b/plugins/shotwell-publishing/YouTubePublishing.c @@ -1,4 +1,4 @@ -/* YouTubePublishing.c generated by valac 0.32.1, the Vala compiler +/* YouTubePublishing.c generated by valac 0.34.1, the Vala compiler * generated from YouTubePublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -3718,39 +3718,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 3716 "YouTubePublishing.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 3722 "YouTubePublishing.c" } diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c index c5b6a4b..0009ab9 100644 --- a/plugins/shotwell-publishing/shotwell-publishing.c +++ b/plugins/shotwell-publishing/shotwell-publishing.c @@ -1,4 +1,4 @@ -/* shotwell-publishing.c generated by valac 0.32.1, the Vala compiler +/* shotwell-publishing.c generated by valac 0.34.1, the Vala compiler * generated from shotwell-publishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. diff --git a/plugins/shotwell-transitions/BlindsEffect.c b/plugins/shotwell-transitions/BlindsEffect.c index a8fa711..ca6ff17 100644 --- a/plugins/shotwell-transitions/BlindsEffect.c +++ b/plugins/shotwell-transitions/BlindsEffect.c @@ -1,4 +1,4 @@ -/* BlindsEffect.c generated by valac 0.32.1, the Vala compiler +/* BlindsEffect.c generated by valac 0.34.1, the Vala compiler * generated from BlindsEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/ChessEffect.c b/plugins/shotwell-transitions/ChessEffect.c index a59a2e6..0542294 100644 --- a/plugins/shotwell-transitions/ChessEffect.c +++ b/plugins/shotwell-transitions/ChessEffect.c @@ -1,4 +1,4 @@ -/* ChessEffect.c generated by valac 0.32.1, the Vala compiler +/* ChessEffect.c generated by valac 0.34.1, the Vala compiler * generated from ChessEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CircleEffect.c b/plugins/shotwell-transitions/CircleEffect.c index 0bd66ef..15b1730 100644 --- a/plugins/shotwell-transitions/CircleEffect.c +++ b/plugins/shotwell-transitions/CircleEffect.c @@ -1,4 +1,4 @@ -/* CircleEffect.c generated by valac 0.32.1, the Vala compiler +/* CircleEffect.c generated by valac 0.34.1, the Vala compiler * generated from CircleEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CirclesEffect.c b/plugins/shotwell-transitions/CirclesEffect.c index 542de61..9be7560 100644 --- a/plugins/shotwell-transitions/CirclesEffect.c +++ b/plugins/shotwell-transitions/CirclesEffect.c @@ -1,4 +1,4 @@ -/* CirclesEffect.c generated by valac 0.32.1, the Vala compiler +/* CirclesEffect.c generated by valac 0.34.1, the Vala compiler * generated from CirclesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/ClockEffect.c b/plugins/shotwell-transitions/ClockEffect.c index 3074f40..e6e8800 100644 --- a/plugins/shotwell-transitions/ClockEffect.c +++ b/plugins/shotwell-transitions/ClockEffect.c @@ -1,4 +1,4 @@ -/* ClockEffect.c generated by valac 0.32.1, the Vala compiler +/* ClockEffect.c generated by valac 0.34.1, the Vala compiler * generated from ClockEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/CrumbleEffect.c b/plugins/shotwell-transitions/CrumbleEffect.c index 4fab4db..71eb2a9 100644 --- a/plugins/shotwell-transitions/CrumbleEffect.c +++ b/plugins/shotwell-transitions/CrumbleEffect.c @@ -1,4 +1,4 @@ -/* CrumbleEffect.c generated by valac 0.32.1, the Vala compiler +/* CrumbleEffect.c generated by valac 0.34.1, the Vala compiler * generated from CrumbleEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/FadeEffect.c b/plugins/shotwell-transitions/FadeEffect.c index 132f3d6..a943b53 100644 --- a/plugins/shotwell-transitions/FadeEffect.c +++ b/plugins/shotwell-transitions/FadeEffect.c @@ -1,4 +1,4 @@ -/* FadeEffect.c generated by valac 0.32.1, the Vala compiler +/* FadeEffect.c generated by valac 0.34.1, the Vala compiler * generated from FadeEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/SlideEffect.c b/plugins/shotwell-transitions/SlideEffect.c index 1fa1cd3..19b10bb 100644 --- a/plugins/shotwell-transitions/SlideEffect.c +++ b/plugins/shotwell-transitions/SlideEffect.c @@ -1,4 +1,4 @@ -/* SlideEffect.c generated by valac 0.32.1, the Vala compiler +/* SlideEffect.c generated by valac 0.34.1, the Vala compiler * generated from SlideEffect.vala, do not modify */ /* Copyright 2010 Maxim Kartashev diff --git a/plugins/shotwell-transitions/SquaresEffect.c b/plugins/shotwell-transitions/SquaresEffect.c index 29fab0c..28bf4b1 100644 --- a/plugins/shotwell-transitions/SquaresEffect.c +++ b/plugins/shotwell-transitions/SquaresEffect.c @@ -1,4 +1,4 @@ -/* SquaresEffect.c generated by valac 0.32.1, the Vala compiler +/* SquaresEffect.c generated by valac 0.34.1, the Vala compiler * generated from SquaresEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/StripesEffect.c b/plugins/shotwell-transitions/StripesEffect.c index c6e802d..2124bd5 100644 --- a/plugins/shotwell-transitions/StripesEffect.c +++ b/plugins/shotwell-transitions/StripesEffect.c @@ -1,4 +1,4 @@ -/* StripesEffect.c generated by valac 0.32.1, the Vala compiler +/* StripesEffect.c generated by valac 0.34.1, the Vala compiler * generated from StripesEffect.vala, do not modify */ /* Copyright 2013 Jens Bav diff --git a/plugins/shotwell-transitions/shotwell-transitions.c b/plugins/shotwell-transitions/shotwell-transitions.c index 7e6d981..cf83002 100644 --- a/plugins/shotwell-transitions/shotwell-transitions.c +++ b/plugins/shotwell-transitions/shotwell-transitions.c @@ -1,4 +1,4 @@ -/* shotwell-transitions.c generated by valac 0.32.1, the Vala compiler +/* shotwell-transitions.c generated by valac 0.34.1, the Vala compiler * generated from shotwell-transitions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. |