summaryrefslogtreecommitdiff
path: root/plugins/shotwell-publishing-extras
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/shotwell-publishing-extras')
-rw-r--r--plugins/shotwell-publishing-extras/GalleryConnector.c508
-rw-r--r--plugins/shotwell-publishing-extras/RajcePublishing.c16
-rw-r--r--plugins/shotwell-publishing-extras/TumblrPublishing.c470
-rw-r--r--plugins/shotwell-publishing-extras/YandexPublishing.c722
-rw-r--r--plugins/shotwell-publishing-extras/YandexPublishing.vala2
-rw-r--r--plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui33
-rw-r--r--plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui82
-rw-r--r--plugins/shotwell-publishing-extras/rajce_authentication_pane.ui56
-rw-r--r--plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui41
-rw-r--r--plugins/shotwell-publishing-extras/shotwell-publishing-extras.c2
-rw-r--r--plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui55
-rw-r--r--plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui25
-rw-r--r--plugins/shotwell-publishing-extras/yandex_publish_model.ui53
13 files changed, 971 insertions, 1094 deletions
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c
index 7b4b296..a2e4c0e 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.4, 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 d953d67..f5faf8d 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.4, the Vala compiler
* generated from RajcePublishing.vala, do not modify */
/* Copyright 2014 rajce.net
@@ -7770,19 +7770,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 7784 "RajcePublishing.c"
}
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index cac5ead..29249a3 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.4, the Vala compiler
* generated from TumblrPublishing.vala, do not modify */
/* Copyright 2012 BJA Electronics
@@ -2803,11 +2803,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 2807 "TumblrPublishing.c"
{
@@ -2822,73 +2822,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 2838 "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 2847 "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 2863 "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 2874 "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 2888 "TumblrPublishing.c"
}
@@ -2896,24 +2896,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 2902 "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 2913 "TumblrPublishing.c"
}
@@ -6101,39 +6101,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 6115 "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 6121 "TumblrPublishing.c"
}
@@ -6146,72 +6146,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 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"
_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 6148 "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 6158 "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 6164 "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 6175 "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 6187 "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 6191 "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 6195 "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 6199 "TumblrPublishing.c"
gint i = 0;
@@ -6234,16 +6234,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 6222 "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 6231 "TumblrPublishing.c"
gboolean _tmp11_ = FALSE;
@@ -6256,97 +6256,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 6244 "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 6250 "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 6260 "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 6272 "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 6276 "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 6282 "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 6293 "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 6308 "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 6312 "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 6316 "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 6322 "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 6334 "TumblrPublishing.c"
gchar** _tmp25_ = NULL;
@@ -6355,91 +6355,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 6355 "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 6359 "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 6365 "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 6372 "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 6380 "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 6418 "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 6427 "TumblrPublishing.c"
gint _tmp48_ = 0;
@@ -6455,94 +6455,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 6443 "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 6449 "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 6463 "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 6483 "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 6498 "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 6502 "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 6510 "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 6521 "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 6530 "TumblrPublishing.c"
}
@@ -8042,37 +8042,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 8037 "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 8045 "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 8057 "TumblrPublishing.c"
}
@@ -8092,112 +8092,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 8081 "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 8087 "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 8091 "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 8095 "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 8107 "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 8117 "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 8123 "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 8137 "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 8147 "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 8153 "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 8162 "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 8182 "TumblrPublishing.c"
}
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 9118b93..8e71f94 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.4, the Vala compiler
* generated from YandexPublishing.vala, do not modify */
/* Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>
@@ -386,7 +386,6 @@ enum {
PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY
};
static void _vala_SoupMultipart_free (SoupMultipart* self);
-static guint8* _vala_array_dup10 (guint8* self, int length);
static void _g_free0_ (gpointer var);
static void _vala_SoupBuffer_free (SoupBuffer* self);
#define PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisherPrivate))
@@ -463,7 +462,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi
result = _tmp2_;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 467 "YandexPublishing.c"
+#line 466 "YandexPublishing.c"
}
@@ -476,7 +475,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.yandex-fotki";
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 480 "YandexPublishing.c"
+#line 479 "YandexPublishing.c"
}
@@ -489,7 +488,7 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base)
result = "Yandex.Fotki";
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 493 "YandexPublishing.c"
+#line 492 "YandexPublishing.c"
}
@@ -556,7 +555,7 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
_g_free0 ((*info).license);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
(*info).license = _tmp8_;
-#line 560 "YandexPublishing.c"
+#line 559 "YandexPublishing.c"
}
@@ -577,7 +576,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 581 "YandexPublishing.c"
+#line 580 "YandexPublishing.c"
}
@@ -590,7 +589,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 594 "YandexPublishing.c"
+#line 593 "YandexPublishing.c"
}
@@ -598,7 +597,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable
YandexService * self;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 602 "YandexPublishing.c"
+#line 601 "YandexPublishing.c"
}
@@ -608,21 +607,21 @@ YandexService* yandex_service_construct (GType object_type) {
self = (YandexService*) g_object_new (object_type, NULL);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 612 "YandexPublishing.c"
+#line 611 "YandexPublishing.c"
}
YandexService* yandex_service_new (void) {
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 619 "YandexPublishing.c"
+#line 618 "YandexPublishing.c"
}
static void yandex_service_class_init (YandexServiceClass * klass) {
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 626 "YandexPublishing.c"
+#line 625 "YandexPublishing.c"
}
@@ -639,7 +638,7 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->activation = (void (*)(SpitPluggable*, gboolean)) yandex_service_real_activation;
-#line 643 "YandexPublishing.c"
+#line 642 "YandexPublishing.c"
}
@@ -650,7 +649,7 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin
iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) yandex_service_real_get_supported_media;
-#line 654 "YandexPublishing.c"
+#line 653 "YandexPublishing.c"
}
@@ -695,14 +694,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G
publishing_yandex_transaction_add_headers (self);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 699 "YandexPublishing.c"
+#line 698 "YandexPublishing.c"
}
PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 706 "YandexPublishing.c"
+#line 705 "YandexPublishing.c"
}
@@ -725,7 +724,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
_publishing_rest_support_session_unref0 (_tmp1_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp3_) {
-#line 729 "YandexPublishing.c"
+#line 728 "YandexPublishing.c"
PublishingRESTSupportSession* _tmp4_ = NULL;
PublishingYandexSession* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -754,7 +753,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
_publishing_rest_support_session_unref0 (_tmp5_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 758 "YandexPublishing.c"
+#line 757 "YandexPublishing.c"
}
}
@@ -775,14 +774,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje
publishing_yandex_transaction_add_headers (self);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 779 "YandexPublishing.c"
+#line 778 "YandexPublishing.c"
}
PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 786 "YandexPublishing.c"
+#line 785 "YandexPublishing.c"
}
@@ -801,14 +800,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
_tmp1_ = type;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 805 "YandexPublishing.c"
+#line 804 "YandexPublishing.c"
}
static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 812 "YandexPublishing.c"
+#line 811 "YandexPublishing.c"
}
@@ -834,14 +833,14 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type)
self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 838 "YandexPublishing.c"
+#line 837 "YandexPublishing.c"
}
PublishingYandexSession* publishing_yandex_session_new (void) {
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 845 "YandexPublishing.c"
+#line 844 "YandexPublishing.c"
}
@@ -857,7 +856,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
result = _tmp0_ != NULL;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 861 "YandexPublishing.c"
+#line 860 "YandexPublishing.c"
}
@@ -868,7 +867,7 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
_g_free0 (self->priv->auth_token);
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = NULL;
-#line 872 "YandexPublishing.c"
+#line 871 "YandexPublishing.c"
}
@@ -887,7 +886,7 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co
_g_free0 (self->priv->auth_token);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = _tmp1_;
-#line 891 "YandexPublishing.c"
+#line 890 "YandexPublishing.c"
}
@@ -905,7 +904,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
result = _tmp1_;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 909 "YandexPublishing.c"
+#line 908 "YandexPublishing.c"
}
@@ -918,7 +917,7 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate));
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_yandex_session_real_is_authenticated;
-#line 922 "YandexPublishing.c"
+#line 921 "YandexPublishing.c"
}
@@ -927,7 +926,7 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s
self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = NULL;
-#line 931 "YandexPublishing.c"
+#line 930 "YandexPublishing.c"
}
@@ -939,7 +938,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob
_g_free0 (self->priv->auth_token);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 943 "YandexPublishing.c"
+#line 942 "YandexPublishing.c"
}
@@ -966,14 +965,14 @@ PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType ob
self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 970 "YandexPublishing.c"
+#line 969 "YandexPublishing.c"
}
PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 977 "YandexPublishing.c"
+#line 976 "YandexPublishing.c"
}
@@ -982,7 +981,7 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie
result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 986 "YandexPublishing.c"
+#line 985 "YandexPublishing.c"
}
@@ -993,7 +992,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
GError * _inner_error_ = NULL;
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 997 "YandexPublishing.c"
+#line 996 "YandexPublishing.c"
{
GRegex* _tmp0_ = NULL;
GRegex* _tmp1_ = NULL;
@@ -1006,7 +1005,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1010 "YandexPublishing.c"
+#line 1009 "YandexPublishing.c"
goto __catch39_g_regex_error;
}
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1015,7 +1014,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_clear_error (&_inner_error_);
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 1019 "YandexPublishing.c"
+#line 1018 "YandexPublishing.c"
}
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = _tmp0_;
@@ -1027,7 +1026,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
self->priv->re = _tmp2_;
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_regex_unref0 (_tmp0_);
-#line 1031 "YandexPublishing.c"
+#line 1030 "YandexPublishing.c"
}
goto __finally39;
__catch39_g_regex_error:
@@ -1041,7 +1040,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_assert_not_reached ();
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 1045 "YandexPublishing.c"
+#line 1044 "YandexPublishing.c"
}
__finally39:
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1052,7 +1051,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_clear_error (&_inner_error_);
#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 1056 "YandexPublishing.c"
+#line 1055 "YandexPublishing.c"
}
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
@@ -1062,7 +1061,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_tmp4_);
-#line 1066 "YandexPublishing.c"
+#line 1065 "YandexPublishing.c"
}
@@ -1070,35 +1069,35 @@ static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCo
PublishingYandexWebAuthPane * self;
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1074 "YandexPublishing.c"
+#line 1073 "YandexPublishing.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 1081 "YandexPublishing.c"
+#line 1080 "YandexPublishing.c"
}
static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) {
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_boxed_copy (webkit_navigation_action_get_type (), self);
-#line 1088 "YandexPublishing.c"
+#line 1087 "YandexPublishing.c"
}
static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) {
#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self ? _vala_WebKitNavigationAction_copy (self) : NULL;
-#line 1095 "YandexPublishing.c"
+#line 1094 "YandexPublishing.c"
}
static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) {
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (webkit_navigation_action_get_type (), self);
-#line 1102 "YandexPublishing.c"
+#line 1101 "YandexPublishing.c"
}
@@ -1115,7 +1114,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
switch (_tmp0_) {
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1119 "YandexPublishing.c"
+#line 1118 "YandexPublishing.c"
{
WebKitNavigationPolicyDecision* n_decision = NULL;
WebKitPolicyDecision* _tmp1_ = NULL;
@@ -1184,7 +1183,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
info = _tmp15_;
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp16_) {
-#line 1188 "YandexPublishing.c"
+#line 1187 "YandexPublishing.c"
gchar* access_token = NULL;
GMatchInfo* _tmp17_ = NULL;
gchar** _tmp18_ = NULL;
@@ -1224,7 +1223,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
_tmp25_ = access_token;
#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp25_ != NULL) {
-#line 1228 "YandexPublishing.c"
+#line 1227 "YandexPublishing.c"
const gchar* _tmp26_ = NULL;
WebKitPolicyDecision* _tmp27_ = NULL;
#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1247,15 +1246,15 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
_g_object_unref0 (n_decision);
#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1251 "YandexPublishing.c"
+#line 1250 "YandexPublishing.c"
} else {
#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_emit_by_name (self, "login-failed");
-#line 1255 "YandexPublishing.c"
+#line 1254 "YandexPublishing.c"
}
#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (access_token);
-#line 1259 "YandexPublishing.c"
+#line 1258 "YandexPublishing.c"
}
#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp28_ = decision;
@@ -1271,11 +1270,11 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
_g_object_unref0 (n_decision);
#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1275 "YandexPublishing.c"
+#line 1274 "YandexPublishing.c"
}
#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1279 "YandexPublishing.c"
+#line 1278 "YandexPublishing.c"
{
WebKitPolicyDecision* _tmp29_ = NULL;
#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1284,7 +1283,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
webkit_policy_decision_use (_tmp29_);
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1288 "YandexPublishing.c"
+#line 1287 "YandexPublishing.c"
}
default:
{
@@ -1292,14 +1291,14 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
result = FALSE;
#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1296 "YandexPublishing.c"
+#line 1295 "YandexPublishing.c"
}
}
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = TRUE;
#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1303 "YandexPublishing.c"
+#line 1302 "YandexPublishing.c"
}
@@ -1318,14 +1317,14 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP
g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1322 "YandexPublishing.c"
+#line 1321 "YandexPublishing.c"
}
static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
-#line 1329 "YandexPublishing.c"
+#line 1328 "YandexPublishing.c"
}
@@ -1337,7 +1336,7 @@ static void publishing_yandex_web_auth_pane_finalize (GObject* obj) {
_g_regex_unref0 (self->priv->re);
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj);
-#line 1341 "YandexPublishing.c"
+#line 1340 "YandexPublishing.c"
}
@@ -1359,21 +1358,21 @@ PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GTy
self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 1363 "YandexPublishing.c"
+#line 1362 "YandexPublishing.c"
}
PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS);
-#line 1370 "YandexPublishing.c"
+#line 1369 "YandexPublishing.c"
}
static void publishing_yandex_value_publish_options_init (GValue* value) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1377 "YandexPublishing.c"
+#line 1376 "YandexPublishing.c"
}
@@ -1382,7 +1381,7 @@ static void publishing_yandex_value_publish_options_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (value->data[0].v_pointer);
-#line 1386 "YandexPublishing.c"
+#line 1385 "YandexPublishing.c"
}
}
@@ -1392,11 +1391,11 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
if (src_value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer);
-#line 1396 "YandexPublishing.c"
+#line 1395 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1400 "YandexPublishing.c"
+#line 1399 "YandexPublishing.c"
}
}
@@ -1404,37 +1403,37 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return value->data[0].v_pointer;
-#line 1408 "YandexPublishing.c"
+#line 1407 "YandexPublishing.c"
}
static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1415 "YandexPublishing.c"
+#line 1414 "YandexPublishing.c"
PublishingYandexPublishOptions* object;
object = collect_values[0].v_pointer;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1422 "YandexPublishing.c"
+#line 1421 "YandexPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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 1426 "YandexPublishing.c"
+#line 1425 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = publishing_yandex_publish_options_ref (object);
-#line 1430 "YandexPublishing.c"
+#line 1429 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1434 "YandexPublishing.c"
+#line 1433 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1438 "YandexPublishing.c"
+#line 1437 "YandexPublishing.c"
}
@@ -1445,25 +1444,25 @@ static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue*
if (!object_p) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1449 "YandexPublishing.c"
+#line 1448 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = NULL;
-#line 1455 "YandexPublishing.c"
+#line 1454 "YandexPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1459 "YandexPublishing.c"
+#line 1458 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1463 "YandexPublishing.c"
+#line 1462 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1467 "YandexPublishing.c"
+#line 1466 "YandexPublishing.c"
}
@@ -1477,7 +1476,7 @@ GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, con
G_PARAM_SPEC (spec)->value_type = object_type;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1481 "YandexPublishing.c"
+#line 1480 "YandexPublishing.c"
}
@@ -1486,7 +1485,7 @@ gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return value->data[0].v_pointer;
-#line 1490 "YandexPublishing.c"
+#line 1489 "YandexPublishing.c"
}
@@ -1506,17 +1505,17 @@ void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_obje
value->data[0].v_pointer = v_object;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1510 "YandexPublishing.c"
+#line 1509 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1514 "YandexPublishing.c"
+#line 1513 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (old) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (old);
-#line 1520 "YandexPublishing.c"
+#line 1519 "YandexPublishing.c"
}
}
@@ -1535,17 +1534,17 @@ void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_obj
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1539 "YandexPublishing.c"
+#line 1538 "YandexPublishing.c"
} else {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1543 "YandexPublishing.c"
+#line 1542 "YandexPublishing.c"
}
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (old) {
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (old);
-#line 1549 "YandexPublishing.c"
+#line 1548 "YandexPublishing.c"
}
}
@@ -1555,7 +1554,7 @@ static void publishing_yandex_publish_options_class_init (PublishingYandexPublis
publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize;
-#line 1559 "YandexPublishing.c"
+#line 1558 "YandexPublishing.c"
}
@@ -1570,7 +1569,7 @@ static void publishing_yandex_publish_options_instance_init (PublishingYandexPub
self->destination_album_url = NULL;
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->ref_count = 1;
-#line 1574 "YandexPublishing.c"
+#line 1573 "YandexPublishing.c"
}
@@ -1586,7 +1585,7 @@ static void publishing_yandex_publish_options_finalize (PublishingYandexPublishO
_g_free0 (self->destination_album);
#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->destination_album_url);
-#line 1590 "YandexPublishing.c"
+#line 1589 "YandexPublishing.c"
}
@@ -1611,7 +1610,7 @@ gpointer publishing_yandex_publish_options_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return instance;
-#line 1615 "YandexPublishing.c"
+#line 1614 "YandexPublishing.c"
}
@@ -1624,7 +1623,7 @@ void publishing_yandex_publish_options_unref (gpointer instance) {
PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self);
#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1628 "YandexPublishing.c"
+#line 1627 "YandexPublishing.c"
}
}
@@ -1638,7 +1637,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_opti
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1642 "YandexPublishing.c"
+#line 1641 "YandexPublishing.c"
}
@@ -1646,7 +1645,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_installed (Sp
PublishingYandexPublishingOptionsPane * self;
#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1650 "YandexPublishing.c"
+#line 1649 "YandexPublishing.c"
}
@@ -1654,7 +1653,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (
PublishingYandexPublishingOptionsPane * self;
#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1658 "YandexPublishing.c"
+#line 1657 "YandexPublishing.c"
}
@@ -1673,21 +1672,21 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi
result = _tmp1_;
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1677 "YandexPublishing.c"
+#line 1676 "YandexPublishing.c"
}
static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1684 "YandexPublishing.c"
+#line 1683 "YandexPublishing.c"
}
static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1691 "YandexPublishing.c"
+#line 1690 "YandexPublishing.c"
}
@@ -1716,7 +1715,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
_g_object_unref0 (self->priv->box);
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->box = _tmp1_;
-#line 1720 "YandexPublishing.c"
+#line 1719 "YandexPublishing.c"
{
GtkBuilder* _tmp2_ = NULL;
GtkBuilder* _tmp3_ = NULL;
@@ -1755,7 +1754,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1759 "YandexPublishing.c"
+#line 1758 "YandexPublishing.c"
goto __catch40_g_error;
}
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1780,7 +1779,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
_g_object_unref0 (self->priv->album_list);
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->album_list = _tmp10_;
-#line 1784 "YandexPublishing.c"
+#line 1783 "YandexPublishing.c"
{
GeeIterator* _key_it = NULL;
GeeHashMap* _tmp11_ = NULL;
@@ -1807,7 +1806,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
_key_it = _tmp16_;
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 1811 "YandexPublishing.c"
+#line 1810 "YandexPublishing.c"
GeeIterator* _tmp17_ = NULL;
gboolean _tmp18_ = FALSE;
gchar* key = NULL;
@@ -1823,7 +1822,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
if (!_tmp18_) {
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1827 "YandexPublishing.c"
+#line 1826 "YandexPublishing.c"
}
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = _key_it;
@@ -1839,11 +1838,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (key);
-#line 1843 "YandexPublishing.c"
+#line 1842 "YandexPublishing.c"
}
#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_key_it);
-#line 1847 "YandexPublishing.c"
+#line 1846 "YandexPublishing.c"
}
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp23_ = self->priv->album_list;
@@ -1895,7 +1894,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0);
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (content);
-#line 1899 "YandexPublishing.c"
+#line 1898 "YandexPublishing.c"
}
goto __finally40;
__catch40_g_error:
@@ -1915,7 +1914,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_);
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 1919 "YandexPublishing.c"
+#line 1918 "YandexPublishing.c"
}
__finally40:
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1926,18 +1925,18 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
g_clear_error (&_inner_error_);
#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1930 "YandexPublishing.c"
+#line 1929 "YandexPublishing.c"
}
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 1934 "YandexPublishing.c"
+#line 1933 "YandexPublishing.c"
}
PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host);
-#line 1941 "YandexPublishing.c"
+#line 1940 "YandexPublishing.c"
}
@@ -1946,7 +1945,7 @@ static void publishing_yandex_publishing_options_pane_on_logout_clicked (Publish
g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_emit_by_name (self, "logout");
-#line 1950 "YandexPublishing.c"
+#line 1949 "YandexPublishing.c"
}
@@ -2047,7 +2046,7 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
_g_object_unref0 (access_type);
#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (tmp);
-#line 2051 "YandexPublishing.c"
+#line 2050 "YandexPublishing.c"
}
@@ -2062,7 +2061,7 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand
g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2066 "YandexPublishing.c"
+#line 2065 "YandexPublishing.c"
}
@@ -2077,14 +2076,14 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan
iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_widget;
-#line 2081 "YandexPublishing.c"
+#line 2080 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) {
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 2088 "YandexPublishing.c"
+#line 2087 "YandexPublishing.c"
}
@@ -2104,7 +2103,7 @@ static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) {
_g_object_unref0 (self->priv->album_list);
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj);
-#line 2108 "YandexPublishing.c"
+#line 2107 "YandexPublishing.c"
}
@@ -2146,14 +2145,14 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ
self->priv->options = _tmp2_;
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2150 "YandexPublishing.c"
+#line 2149 "YandexPublishing.c"
}
PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1);
-#line 2157 "YandexPublishing.c"
+#line 2156 "YandexPublishing.c"
}
@@ -2195,7 +2194,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
result = _tmp6_;
#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2199 "YandexPublishing.c"
+#line 2198 "YandexPublishing.c"
}
@@ -2208,14 +2207,14 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass
g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate));
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_yandex_uploader_real_create_transaction;
-#line 2212 "YandexPublishing.c"
+#line 2211 "YandexPublishing.c"
}
static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) {
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self);
-#line 2219 "YandexPublishing.c"
+#line 2218 "YandexPublishing.c"
}
@@ -2225,7 +2224,7 @@ static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploa
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj);
-#line 2229 "YandexPublishing.c"
+#line 2228 "YandexPublishing.c"
}
@@ -2243,26 +2242,26 @@ 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 2249 "YandexPublishing.c"
+#line 2248 "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 2257 "YandexPublishing.c"
+#line 2256 "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 2266 "YandexPublishing.c"
+#line 2265 "YandexPublishing.c"
}
}
@@ -2270,7 +2269,7 @@ static gchar* bool_to_string (gboolean self) {
static void _vala_SoupMultipart_free (SoupMultipart* self) {
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 2274 "YandexPublishing.c"
+#line 2273 "YandexPublishing.c"
}
@@ -2286,62 +2285,55 @@ 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 2318 "YandexPublishing.c"
+#line 2317 "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 2324 "YandexPublishing.c"
-}
-
-
-static guint8* _vala_array_dup10 (guint8* self, int length) {
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return g_memdup (self, length * sizeof (guint8));
-#line 2331 "YandexPublishing.c"
+#line 2323 "YandexPublishing.c"
}
static void _g_free0_ (gpointer var) {
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
var = (g_free (var), NULL);
-#line 2338 "YandexPublishing.c"
+#line 2330 "YandexPublishing.c"
}
static void _vala_SoupBuffer_free (SoupBuffer* self) {
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 2345 "YandexPublishing.c"
+#line 2337 "YandexPublishing.c"
}
@@ -2383,38 +2375,36 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
gint _tmp41__length1 = 0;
guint8* _tmp42_ = NULL;
gint _tmp42__length1 = 0;
- guint8* _tmp43_ = NULL;
- gint _tmp43__length1 = 0;
- SoupBuffer* _tmp44_ = NULL;
- SpitPublishingPublishable* _tmp45_ = NULL;
+ SoupBuffer* _tmp43_ = NULL;
+ SpitPublishingPublishable* _tmp44_ = NULL;
+ GFile* _tmp45_ = NULL;
GFile* _tmp46_ = NULL;
- GFile* _tmp47_ = NULL;
+ gchar* _tmp47_ = NULL;
gchar* _tmp48_ = NULL;
- gchar* _tmp49_ = NULL;
SoupMessageHeaders* image_part_header = NULL;
SoupBuffer* image_part_body = NULL;
- SoupMessageHeaders* _tmp50_ = NULL;
- SoupBuffer* _tmp51_ = NULL;
+ SoupMessageHeaders* _tmp49_ = NULL;
+ SoupBuffer* _tmp50_ = NULL;
GHashTable* _result_ = NULL;
- GHashFunc _tmp52_ = NULL;
- GEqualFunc _tmp53_ = NULL;
- GHashTable* _tmp54_ = NULL;
+ GHashFunc _tmp51_ = NULL;
+ GEqualFunc _tmp52_ = NULL;
+ GHashTable* _tmp53_ = NULL;
+ gchar* _tmp54_ = NULL;
gchar* _tmp55_ = NULL;
gchar* _tmp56_ = NULL;
gchar* _tmp57_ = NULL;
- gchar* _tmp58_ = NULL;
SoupMessage* outbound_message = NULL;
+ gchar* _tmp58_ = NULL;
gchar* _tmp59_ = NULL;
- gchar* _tmp60_ = NULL;
+ SoupMessage* _tmp60_ = NULL;
SoupMessage* _tmp61_ = NULL;
- SoupMessage* _tmp62_ = NULL;
- SoupMessageHeaders* _tmp63_ = NULL;
- PublishingYandexSession* _tmp64_ = NULL;
+ SoupMessageHeaders* _tmp62_ = NULL;
+ PublishingYandexSession* _tmp63_ = NULL;
+ gchar* _tmp64_ = NULL;
gchar* _tmp65_ = NULL;
gchar* _tmp66_ = NULL;
gchar* _tmp67_ = NULL;
- gchar* _tmp68_ = NULL;
- SoupMessageHeaders* _tmp69_ = NULL;
+ SoupMessageHeaders* _tmp68_ = NULL;
GError * _inner_error_ = NULL;
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
@@ -2500,7 +2490,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
soup_multipart_append_form_string (message_parts, "access", _tmp25_);
#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp25_);
-#line 2504 "YandexPublishing.c"
+#line 2494 "YandexPublishing.c"
{
SpitPublishingPublishable* _tmp26_ = NULL;
GFile* _tmp27_ = NULL;
@@ -2535,7 +2525,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 2539 "YandexPublishing.c"
+#line 2529 "YandexPublishing.c"
goto __catch41_g_file_error;
}
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2548,7 +2538,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
g_clear_error (&_inner_error_);
#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 2552 "YandexPublishing.c"
+#line 2542 "YandexPublishing.c"
}
}
goto __finally41;
@@ -2588,7 +2578,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
_g_object_unref0 (_tmp35_);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 2592 "YandexPublishing.c"
+#line 2582 "YandexPublishing.c"
}
__finally41:
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2603,7 +2593,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
g_clear_error (&_inner_error_);
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 2607 "YandexPublishing.c"
+#line 2597 "YandexPublishing.c"
}
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp40_ = soup_multipart_get_length (message_parts);
@@ -2616,91 +2606,87 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp42__length1 = _tmp41__length1;
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp43_ = (_tmp42_ != NULL) ? _vala_array_dup10 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_);
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp43__length1 = _tmp42__length1;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp44_ = soup_buffer_new_take (_tmp43_, _tmp43__length1);
+ _tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0);
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- bindable_data = _tmp44_;
+ bindable_data = _tmp43_;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp45_ = photo;
+ _tmp44_ = photo;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp46_ = spit_publishing_publishable_get_serialized_file (_tmp45_);
+ _tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp47_ = _tmp46_;
+ _tmp46_ = _tmp45_;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp48_ = g_file_get_path (_tmp47_);
+ _tmp47_ = g_file_get_path (_tmp46_);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp49_ = _tmp48_;
+ _tmp48_ = _tmp47_;
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_append_form_file (message_parts, "", _tmp49_, "image/jpeg", bindable_data);
+ soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp49_);
+ _g_free0 (_tmp48_);
#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp47_);
+ _g_object_unref0 (_tmp46_);
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_multipart_get_part (message_parts, image_part_num, &_tmp50_, &_tmp51_);
+ soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_);
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- image_part_header = _tmp50_;
+ image_part_header = _tmp49_;
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- image_part_body = _tmp51_;
+ image_part_body = _tmp50_;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp52_ = g_str_hash;
+ _tmp51_ = g_str_hash;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp53_ = g_str_equal;
+ _tmp52_ = g_str_equal;
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp54_ = g_hash_table_new_full (_tmp52_, _tmp53_, _g_free0_, _g_free0_);
+ _tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _result_ = _tmp54_;
+ _result_ = _tmp53_;
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp55_ = g_strdup ("name");
+ _tmp54_ = g_strdup ("name");
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp56_ = g_strdup ("image");
+ _tmp55_ = g_strdup ("image");
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_hash_table_insert (_result_, _tmp55_, _tmp56_);
+ g_hash_table_insert (_result_, _tmp54_, _tmp55_);
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp57_ = g_strdup ("filename");
+ _tmp56_ = g_strdup ("filename");
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp58_ = g_strdup ("unused");
+ _tmp57_ = g_strdup ("unused");
#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_hash_table_insert (_result_, _tmp57_, _tmp58_);
+ g_hash_table_insert (_result_, _tmp56_, _tmp57_);
#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_message_headers_set_content_disposition (image_part_header, "form-data", _result_);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp59_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+ _tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp60_ = _tmp59_;
+ _tmp59_ = _tmp58_;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp61_ = soup_form_request_new_from_multipart (_tmp60_, message_parts);
+ _tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp62_ = _tmp61_;
+ _tmp61_ = _tmp60_;
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp60_);
+ _g_free0 (_tmp59_);
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- outbound_message = _tmp62_;
+ outbound_message = _tmp61_;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp63_ = outbound_message->request_headers;
+ _tmp62_ = outbound_message->request_headers;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp64_ = session;
+ _tmp63_ = session;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp65_ = publishing_yandex_session_get_auth_token (_tmp64_);
+ _tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp66_ = _tmp65_;
+ _tmp65_ = _tmp64_;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp67_ = g_strdup_printf ("OAuth %s", _tmp66_);
+ _tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp68_ = _tmp67_;
+ _tmp67_ = _tmp66_;
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_message_headers_append (_tmp63_, "Authorization", _tmp68_);
+ soup_message_headers_append (_tmp62_, "Authorization", _tmp67_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp68_);
+ _g_free0 (_tmp67_);
#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (_tmp66_);
+ _g_free0 (_tmp65_);
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp69_ = outbound_message->request_headers;
+ _tmp68_ = outbound_message->request_headers;
#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- soup_message_headers_append (_tmp69_, "Connection", "close");
+ soup_message_headers_append (_tmp68_, "Connection", "close");
#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2715,21 +2701,21 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
__vala_SoupMultipart_free0 (message_parts);
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2719 "YandexPublishing.c"
+#line 2705 "YandexPublishing.c"
}
PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo);
-#line 2726 "YandexPublishing.c"
+#line 2712 "YandexPublishing.c"
}
static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) {
#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2733 "YandexPublishing.c"
+#line 2719 "YandexPublishing.c"
}
@@ -2790,14 +2776,14 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
self->priv->options = _tmp4_;
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2794 "YandexPublishing.c"
+#line 2780 "YandexPublishing.c"
}
PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host);
-#line 2801 "YandexPublishing.c"
+#line 2787 "YandexPublishing.c"
}
@@ -2815,7 +2801,7 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY
result = _tmp1_;
#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2819 "YandexPublishing.c"
+#line 2805 "YandexPublishing.c"
}
@@ -2832,7 +2818,7 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan
_tmp1_ = auth_token;
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_);
-#line 2836 "YandexPublishing.c"
+#line 2822 "YandexPublishing.c"
}
@@ -2844,7 +2830,7 @@ void publishing_yandex_yandex_publisher_invalidate_persistent_session (Publishin
_tmp0_ = self->priv->host;
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token");
-#line 2848 "YandexPublishing.c"
+#line 2834 "YandexPublishing.c"
}
@@ -2867,7 +2853,7 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub
result = _tmp2_;
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2871 "YandexPublishing.c"
+#line 2857 "YandexPublishing.c"
}
@@ -2883,7 +2869,7 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi
result = _tmp0_;
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2887 "YandexPublishing.c"
+#line 2873 "YandexPublishing.c"
}
@@ -2902,7 +2888,7 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic
result = _tmp1_;
#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2906 "YandexPublishing.c"
+#line 2892 "YandexPublishing.c"
}
@@ -2916,7 +2902,7 @@ static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYande
result = NULL;
#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2920 "YandexPublishing.c"
+#line 2906 "YandexPublishing.c"
}
@@ -2929,7 +2915,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
title = NULL;
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
link = NULL;
-#line 2933 "YandexPublishing.c"
+#line 2919 "YandexPublishing.c"
{
xmlNode* c = NULL;
xmlNode* _tmp0_ = NULL;
@@ -2940,14 +2926,14 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_tmp1_ = _tmp0_->children;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp1_;
-#line 2944 "YandexPublishing.c"
+#line 2930 "YandexPublishing.c"
{
gboolean _tmp2_ = FALSE;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = TRUE;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 2951 "YandexPublishing.c"
+#line 2937 "YandexPublishing.c"
xmlNode* _tmp5_ = NULL;
xmlNode* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
@@ -2958,7 +2944,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
const gchar* _tmp19_ = NULL;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp2_) {
-#line 2962 "YandexPublishing.c"
+#line 2948 "YandexPublishing.c"
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2967,7 +2953,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_tmp4_ = _tmp3_->next;
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp4_;
-#line 2971 "YandexPublishing.c"
+#line 2957 "YandexPublishing.c"
}
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = FALSE;
@@ -2977,7 +2963,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
if (!(_tmp5_ != NULL)) {
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 2981 "YandexPublishing.c"
+#line 2967 "YandexPublishing.c"
}
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = c;
@@ -2985,7 +2971,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_tmp7_ = _tmp6_->name;
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 2989 "YandexPublishing.c"
+#line 2975 "YandexPublishing.c"
xmlNode* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2996,7 +2982,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_g_free0 (title);
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
title = _tmp9_;
-#line 3000 "YandexPublishing.c"
+#line 2986 "YandexPublishing.c"
}
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = c;
@@ -3004,7 +2990,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_tmp12_ = _tmp11_->name;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 3008 "YandexPublishing.c"
+#line 2994 "YandexPublishing.c"
xmlNode* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
@@ -3018,15 +3004,15 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp15_);
-#line 3022 "YandexPublishing.c"
+#line 3008 "YandexPublishing.c"
} else {
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = FALSE;
-#line 3026 "YandexPublishing.c"
+#line 3012 "YandexPublishing.c"
}
#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp10_) {
-#line 3030 "YandexPublishing.c"
+#line 3016 "YandexPublishing.c"
xmlNode* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3037,27 +3023,27 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_g_free0 (link);
#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
link = _tmp17_;
-#line 3041 "YandexPublishing.c"
+#line 3027 "YandexPublishing.c"
}
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = title;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp19_ != NULL) {
-#line 3047 "YandexPublishing.c"
+#line 3033 "YandexPublishing.c"
const gchar* _tmp20_ = NULL;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = link;
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = _tmp20_ != NULL;
-#line 3053 "YandexPublishing.c"
+#line 3039 "YandexPublishing.c"
} else {
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = FALSE;
-#line 3057 "YandexPublishing.c"
+#line 3043 "YandexPublishing.c"
}
#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp18_) {
-#line 3061 "YandexPublishing.c"
+#line 3047 "YandexPublishing.c"
const gchar* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
GeeHashMap* _tmp23_ = NULL;
@@ -3087,7 +3073,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
link = NULL;
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 3091 "YandexPublishing.c"
+#line 3077 "YandexPublishing.c"
}
}
}
@@ -3096,7 +3082,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
_g_free0 (link);
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (title);
-#line 3100 "YandexPublishing.c"
+#line 3086 "YandexPublishing.c"
}
@@ -3105,7 +3091,7 @@ static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest
result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3109 "YandexPublishing.c"
+#line 3095 "YandexPublishing.c"
}
@@ -3136,7 +3122,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
g_propagate_error (error, _inner_error_);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3140 "YandexPublishing.c"
+#line 3126 "YandexPublishing.c"
} else {
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
@@ -3144,7 +3130,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
g_clear_error (&_inner_error_);
#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3148 "YandexPublishing.c"
+#line 3134 "YandexPublishing.c"
}
}
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3167,7 +3153,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
_publishing_rest_support_xml_document_unref0 (doc);
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3171 "YandexPublishing.c"
+#line 3157 "YandexPublishing.c"
} else {
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
@@ -3177,12 +3163,12 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
g_clear_error (&_inner_error_);
#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3181 "YandexPublishing.c"
+#line 3167 "YandexPublishing.c"
}
}
#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 3186 "YandexPublishing.c"
+#line 3172 "YandexPublishing.c"
}
@@ -3212,7 +3198,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
g_propagate_error (error, _inner_error_);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3216 "YandexPublishing.c"
+#line 3202 "YandexPublishing.c"
} else {
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.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);
@@ -3220,7 +3206,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
g_clear_error (&_inner_error_);
#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3224 "YandexPublishing.c"
+#line 3210 "YandexPublishing.c"
}
}
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3229,7 +3215,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
root = _tmp3_;
-#line 3233 "YandexPublishing.c"
+#line 3219 "YandexPublishing.c"
{
xmlNode* e = NULL;
xmlNode* _tmp4_ = NULL;
@@ -3240,21 +3226,21 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
_tmp5_ = _tmp4_->children;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _tmp5_;
-#line 3244 "YandexPublishing.c"
+#line 3230 "YandexPublishing.c"
{
gboolean _tmp6_ = FALSE;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = TRUE;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 3251 "YandexPublishing.c"
+#line 3237 "YandexPublishing.c"
xmlNode* _tmp9_ = NULL;
xmlNode* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
xmlNode* _tmp12_ = NULL;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp6_) {
-#line 3258 "YandexPublishing.c"
+#line 3244 "YandexPublishing.c"
xmlNode* _tmp7_ = NULL;
xmlNode* _tmp8_ = NULL;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3263,7 +3249,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
_tmp8_ = _tmp7_->next;
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _tmp8_;
-#line 3267 "YandexPublishing.c"
+#line 3253 "YandexPublishing.c"
}
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = FALSE;
@@ -3273,7 +3259,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
if (!(_tmp9_ != NULL)) {
#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 3277 "YandexPublishing.c"
+#line 3263 "YandexPublishing.c"
}
#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = e;
@@ -3283,7 +3269,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
if (g_strcmp0 (_tmp11_, "entry") != 0) {
#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 3287 "YandexPublishing.c"
+#line 3273 "YandexPublishing.c"
}
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = e;
@@ -3299,7 +3285,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
_publishing_rest_support_xml_document_unref0 (doc);
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3303 "YandexPublishing.c"
+#line 3289 "YandexPublishing.c"
} else {
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
@@ -3309,7 +3295,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
g_clear_error (&_inner_error_);
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3313 "YandexPublishing.c"
+#line 3299 "YandexPublishing.c"
}
}
}
@@ -3317,21 +3303,21 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
}
#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 3321 "YandexPublishing.c"
+#line 3307 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3328 "YandexPublishing.c"
+#line 3314 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3335 "YandexPublishing.c"
+#line 3321 "YandexPublishing.c"
}
@@ -3364,7 +3350,7 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY
_tmp5_ = _tmp4_->message;
#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_);
-#line 3368 "YandexPublishing.c"
+#line 3354 "YandexPublishing.c"
}
@@ -3396,7 +3382,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 3400 "YandexPublishing.c"
+#line 3386 "YandexPublishing.c"
{
PublishingRESTSupportTransaction* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -3415,7 +3401,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3419 "YandexPublishing.c"
+#line 3405 "YandexPublishing.c"
goto __catch42_spit_publishing_publishing_error;
}
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3424,7 +3410,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
g_clear_error (&_inner_error_);
#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3428 "YandexPublishing.c"
+#line 3414 "YandexPublishing.c"
}
}
goto __finally42;
@@ -3447,7 +3433,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
_g_error_free0 (err);
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3451 "YandexPublishing.c"
+#line 3437 "YandexPublishing.c"
}
__finally42:
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3458,7 +3444,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
g_clear_error (&_inner_error_);
#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3462 "YandexPublishing.c"
+#line 3448 "YandexPublishing.c"
}
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = self->priv->album_list;
@@ -3478,7 +3464,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
if (_tmp14_) {
#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_upload (self);
-#line 3482 "YandexPublishing.c"
+#line 3468 "YandexPublishing.c"
} else {
SpitPublishingPluginHost* _tmp15_ = NULL;
GError* _tmp16_ = NULL;
@@ -3493,7 +3479,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (_tmp17_);
-#line 3497 "YandexPublishing.c"
+#line 3483 "YandexPublishing.c"
}
}
@@ -3539,7 +3525,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3542 "YandexPublishing.c"
+#line 3528 "YandexPublishing.c"
{
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3547,7 +3533,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3550 "YandexPublishing.c"
+#line 3536 "YandexPublishing.c"
goto __catch43_spit_publishing_publishing_error;
}
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3562,7 +3548,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
g_clear_error (&_inner_error_);
#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3565 "YandexPublishing.c"
+#line 3551 "YandexPublishing.c"
}
}
goto __finally43;
@@ -3583,7 +3569,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 3586 "YandexPublishing.c"
+#line 3572 "YandexPublishing.c"
}
__finally43:
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3600,7 +3586,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
g_clear_error (&_inner_error_);
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3603 "YandexPublishing.c"
+#line 3589 "YandexPublishing.c"
}
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
@@ -3608,21 +3594,21 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
_g_free0 (data);
#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (album);
-#line 3611 "YandexPublishing.c"
+#line 3597 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published);
-#line 3618 "YandexPublishing.c"
+#line 3604 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3625 "YandexPublishing.c"
+#line 3611 "YandexPublishing.c"
}
@@ -3654,7 +3640,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
_tmp4_ = num_published;
#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp4_ == 0) {
-#line 3657 "YandexPublishing.c"
+#line 3643 "YandexPublishing.c"
SpitPublishingPluginHost* _tmp5_ = NULL;
GError* _tmp6_ = NULL;
GError* _tmp7_ = NULL;
@@ -3668,7 +3654,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (_tmp7_);
-#line 3671 "YandexPublishing.c"
+#line 3657 "YandexPublishing.c"
}
#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = self->priv->host;
@@ -3678,7 +3664,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
_tmp9_ = self->priv->host;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3681 "YandexPublishing.c"
+#line 3667 "YandexPublishing.c"
}
@@ -3711,7 +3697,7 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex
_tmp5_ = _tmp4_->message;
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
-#line 3714 "YandexPublishing.c"
+#line 3700 "YandexPublishing.c"
}
@@ -3746,14 +3732,14 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish
_tmp4_ = completed_fraction;
#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 3748 "YandexPublishing.c"
+#line 3734 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete);
-#line 3755 "YandexPublishing.c"
+#line 3741 "YandexPublishing.c"
}
@@ -3844,7 +3830,7 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3846 "YandexPublishing.c"
+#line 3832 "YandexPublishing.c"
}
@@ -3859,7 +3845,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
if (!_tmp0_) {
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3861 "YandexPublishing.c"
+#line 3847 "YandexPublishing.c"
}
#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->session;
@@ -3871,7 +3857,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
self->priv->running = FALSE;
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3873 "YandexPublishing.c"
+#line 3859 "YandexPublishing.c"
}
@@ -3927,11 +3913,11 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
if (_tmp12_) {
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_create_destination_album (self);
-#line 3929 "YandexPublishing.c"
+#line 3915 "YandexPublishing.c"
} else {
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_upload (self);
-#line 3933 "YandexPublishing.c"
+#line 3919 "YandexPublishing.c"
}
}
@@ -3939,14 +3925,14 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3941 "YandexPublishing.c"
+#line 3927 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3948 "YandexPublishing.c"
+#line 3934 "YandexPublishing.c"
}
@@ -3981,21 +3967,21 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing
_tmp5_ = _tmp4_->message;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_);
-#line 3983 "YandexPublishing.c"
+#line 3969 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self);
-#line 3990 "YandexPublishing.c"
+#line 3976 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self);
-#line 3997 "YandexPublishing.c"
+#line 3983 "YandexPublishing.c"
}
@@ -4040,7 +4026,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp6_);
-#line 4042 "YandexPublishing.c"
+#line 4028 "YandexPublishing.c"
{
PublishingRESTSupportTransaction* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
@@ -4059,7 +4045,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4061 "YandexPublishing.c"
+#line 4047 "YandexPublishing.c"
goto __catch44_spit_publishing_publishing_error;
}
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4068,7 +4054,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
g_clear_error (&_inner_error_);
#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4070 "YandexPublishing.c"
+#line 4056 "YandexPublishing.c"
}
}
goto __finally44;
@@ -4089,7 +4075,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4091 "YandexPublishing.c"
+#line 4077 "YandexPublishing.c"
}
__finally44:
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4100,7 +4086,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
g_clear_error (&_inner_error_);
#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4102 "YandexPublishing.c"
+#line 4088 "YandexPublishing.c"
}
#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = self->priv->options;
@@ -4122,7 +4108,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (publishing_options_pane);
-#line 4124 "YandexPublishing.c"
+#line 4110 "YandexPublishing.c"
}
@@ -4158,7 +4144,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0);
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4160 "YandexPublishing.c"
+#line 4146 "YandexPublishing.c"
{
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4166,7 +4152,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4168 "YandexPublishing.c"
+#line 4154 "YandexPublishing.c"
goto __catch45_spit_publishing_publishing_error;
}
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4177,7 +4163,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
g_clear_error (&_inner_error_);
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4179 "YandexPublishing.c"
+#line 4165 "YandexPublishing.c"
}
}
goto __finally45;
@@ -4198,7 +4184,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4200 "YandexPublishing.c"
+#line 4186 "YandexPublishing.c"
}
__finally45:
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4211,25 +4197,25 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
g_clear_error (&_inner_error_);
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4213 "YandexPublishing.c"
+#line 4199 "YandexPublishing.c"
}
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 4217 "YandexPublishing.c"
+#line 4203 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4224 "YandexPublishing.c"
+#line 4210 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4231 "YandexPublishing.c"
+#line 4217 "YandexPublishing.c"
}
@@ -4262,7 +4248,7 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan
_tmp5_ = _tmp4_->message;
#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_);
-#line 4264 "YandexPublishing.c"
+#line 4250 "YandexPublishing.c"
}
@@ -4301,7 +4287,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp6_);
-#line 4303 "YandexPublishing.c"
+#line 4289 "YandexPublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
PublishingRESTSupportTransaction* _tmp7_ = NULL;
@@ -4330,7 +4316,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4332 "YandexPublishing.c"
+#line 4318 "YandexPublishing.c"
goto __catch46_spit_publishing_publishing_error;
}
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4339,7 +4325,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
g_clear_error (&_inner_error_);
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4341 "YandexPublishing.c"
+#line 4327 "YandexPublishing.c"
}
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = doc;
@@ -4347,7 +4333,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
root = _tmp13_;
-#line 4349 "YandexPublishing.c"
+#line 4335 "YandexPublishing.c"
{
xmlNode* work = NULL;
xmlNode* _tmp14_ = NULL;
@@ -4358,20 +4344,20 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
_tmp15_ = _tmp14_->children;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
work = _tmp15_;
-#line 4360 "YandexPublishing.c"
+#line 4346 "YandexPublishing.c"
{
gboolean _tmp16_ = FALSE;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = TRUE;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 4367 "YandexPublishing.c"
+#line 4353 "YandexPublishing.c"
xmlNode* _tmp19_ = NULL;
xmlNode* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp16_) {
-#line 4373 "YandexPublishing.c"
+#line 4359 "YandexPublishing.c"
xmlNode* _tmp17_ = NULL;
xmlNode* _tmp18_ = NULL;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4380,7 +4366,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
_tmp18_ = _tmp17_->next;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
work = _tmp18_;
-#line 4382 "YandexPublishing.c"
+#line 4368 "YandexPublishing.c"
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = FALSE;
@@ -4390,7 +4376,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
if (!(_tmp19_ != NULL)) {
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4392 "YandexPublishing.c"
+#line 4378 "YandexPublishing.c"
}
#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = work;
@@ -4400,7 +4386,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
if (g_strcmp0 (_tmp21_, "workspace") != 0) {
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 4402 "YandexPublishing.c"
+#line 4388 "YandexPublishing.c"
}
{
xmlNode* c = NULL;
@@ -4412,14 +4398,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
_tmp23_ = _tmp22_->children;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp23_;
-#line 4414 "YandexPublishing.c"
+#line 4400 "YandexPublishing.c"
{
gboolean _tmp24_ = FALSE;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = TRUE;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 4421 "YandexPublishing.c"
+#line 4407 "YandexPublishing.c"
xmlNode* _tmp27_ = NULL;
xmlNode* _tmp28_ = NULL;
const gchar* _tmp29_ = NULL;
@@ -4429,7 +4415,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
gboolean _tmp33_ = FALSE;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp24_) {
-#line 4431 "YandexPublishing.c"
+#line 4417 "YandexPublishing.c"
xmlNode* _tmp25_ = NULL;
xmlNode* _tmp26_ = NULL;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4438,7 +4424,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
_tmp26_ = _tmp25_->next;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp26_;
-#line 4440 "YandexPublishing.c"
+#line 4426 "YandexPublishing.c"
}
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = FALSE;
@@ -4448,7 +4434,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
if (!(_tmp27_ != NULL)) {
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4450 "YandexPublishing.c"
+#line 4436 "YandexPublishing.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp28_ = c;
@@ -4458,7 +4444,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
if (g_strcmp0 (_tmp29_, "collection") != 0) {
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 4460 "YandexPublishing.c"
+#line 4446 "YandexPublishing.c"
}
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp30_ = c;
@@ -4472,7 +4458,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
_g_free0 (_tmp32_);
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp33_) {
-#line 4474 "YandexPublishing.c"
+#line 4460 "YandexPublishing.c"
gchar* url = NULL;
xmlNode* _tmp34_ = NULL;
gchar* _tmp35_ = NULL;
@@ -4504,7 +4490,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
_g_free0 (url);
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4506 "YandexPublishing.c"
+#line 4492 "YandexPublishing.c"
}
}
}
@@ -4514,7 +4500,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
}
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4516 "YandexPublishing.c"
+#line 4502 "YandexPublishing.c"
}
goto __finally46;
__catch46_spit_publishing_publishing_error:
@@ -4534,7 +4520,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4536 "YandexPublishing.c"
+#line 4522 "YandexPublishing.c"
}
__finally46:
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4545,7 +4531,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
g_clear_error (&_inner_error_);
#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4547 "YandexPublishing.c"
+#line 4533 "YandexPublishing.c"
}
}
@@ -4577,7 +4563,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0);
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4579 "YandexPublishing.c"
+#line 4565 "YandexPublishing.c"
{
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4585,7 +4571,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4587 "YandexPublishing.c"
+#line 4573 "YandexPublishing.c"
goto __catch47_spit_publishing_publishing_error;
}
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4596,7 +4582,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
g_clear_error (&_inner_error_);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4598 "YandexPublishing.c"
+#line 4584 "YandexPublishing.c"
}
}
goto __finally47;
@@ -4617,7 +4603,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4619 "YandexPublishing.c"
+#line 4605 "YandexPublishing.c"
}
__finally47:
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4630,11 +4616,11 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
g_clear_error (&_inner_error_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4632 "YandexPublishing.c"
+#line 4618 "YandexPublishing.c"
}
#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 4636 "YandexPublishing.c"
+#line 4622 "YandexPublishing.c"
}
@@ -4663,7 +4649,7 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish
_tmp3_ = access_token;
#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_);
-#line 4665 "YandexPublishing.c"
+#line 4651 "YandexPublishing.c"
}
@@ -4672,21 +4658,21 @@ static void publishing_yandex_yandex_publisher_web_auth_login_failed (Publishing
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_debug ("YandexPublishing.vala:595: login failed");
-#line 4674 "YandexPublishing.c"
+#line 4660 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4681 "YandexPublishing.c"
+#line 4667 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self);
-#line 4688 "YandexPublishing.c"
+#line 4674 "YandexPublishing.c"
}
@@ -4731,14 +4717,14 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
_tmp7_ = self->priv->web_auth_pane;
#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 4733 "YandexPublishing.c"
+#line 4719 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) {
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self);
-#line 4740 "YandexPublishing.c"
+#line 4726 "YandexPublishing.c"
}
@@ -4753,7 +4739,7 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand
_tmp1_ = _ ("You are not currently logged into Yandex.Fotki.");
#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 4755 "YandexPublishing.c"
+#line 4741 "YandexPublishing.c"
}
@@ -4770,7 +4756,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
if (_tmp0_) {
#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4772 "YandexPublishing.c"
+#line 4758 "YandexPublishing.c"
}
#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->host;
@@ -4779,7 +4765,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \
"s publisher is not restartable.");
-#line 4780 "YandexPublishing.c"
+#line 4766 "YandexPublishing.c"
}
#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
@@ -4789,7 +4775,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
_tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self);
#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp2_) {
-#line 4790 "YandexPublishing.c"
+#line 4776 "YandexPublishing.c"
PublishingYandexSession* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -4813,11 +4799,11 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp7_);
-#line 4814 "YandexPublishing.c"
+#line 4800 "YandexPublishing.c"
} else {
#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 4818 "YandexPublishing.c"
+#line 4804 "YandexPublishing.c"
}
}
@@ -4832,7 +4818,7 @@ static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublishe
self->priv->host = NULL;
#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = FALSE;
-#line 4833 "YandexPublishing.c"
+#line 4819 "YandexPublishing.c"
}
@@ -4843,7 +4829,7 @@ static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYande
g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate));
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize;
-#line 4844 "YandexPublishing.c"
+#line 4830 "YandexPublishing.c"
}
@@ -4858,7 +4844,7 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa
iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start;
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_stop;
-#line 4859 "YandexPublishing.c"
+#line 4845 "YandexPublishing.c"
}
@@ -4879,7 +4865,7 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa
self->priv->running = FALSE;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->web_auth_pane = NULL;
-#line 4880 "YandexPublishing.c"
+#line 4866 "YandexPublishing.c"
}
@@ -4907,7 +4893,7 @@ static void publishing_yandex_yandex_publisher_finalize (GObject* obj) {
_publishing_rest_support_session_unref0 (self->priv->session);
#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj);
-#line 4908 "YandexPublishing.c"
+#line 4894 "YandexPublishing.c"
}
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index dbfa3de..0bf929e 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -275,7 +275,7 @@ private class UploadTransaction: Transaction {
int image_part_num = message_parts.get_length();
- var bindable_data = new Soup.Buffer.take (photo_data.data);
+ Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, photo_data.data[0:data_length]);
message_parts.append_form_file("", photo.get_serialized_file().get_path(), "image/jpeg", bindable_data);
unowned Soup.MessageHeaders image_part_header;
diff --git a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
index 1f2dfae..3317805 100644
--- a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
@@ -1,12 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAction" id="go_back_action">
- <property name="label" translatable="yes">Go _Back</property>
- </object>
- <object class="GtkAction" id="login_action">
- <property name="label" translatable="yes">_Log in</property>
- </object>
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkGrid" id="gallery3_auth_pane_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -23,7 +18,6 @@
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">5</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -38,8 +32,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -54,7 +46,6 @@
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">4</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -68,8 +59,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -83,8 +72,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -96,8 +83,6 @@
<packing>
<property name="left_attach">3</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -111,8 +96,6 @@
<packing>
<property name="left_attach">3</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -123,7 +106,6 @@
<child>
<object class="GtkButton" id="go_back_button">
<property name="label" translatable="yes">Go _Back</property>
- <property name="related_action">go_back_action</property>
<property name="width_request">102</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -136,14 +118,11 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="login_button">
<property name="label" translatable="yes">_Log in</property>
- <property name="related_action">login_action</property>
<property name="width_request">102</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -159,8 +138,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -168,7 +145,6 @@
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="width">5</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -182,8 +158,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -197,8 +171,6 @@
<packing>
<property name="left_attach">3</property>
<property name="top_attach">5</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -211,7 +183,6 @@
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="width">5</property>
- <property name="height">1</property>
</packing>
</child>
<child>
diff --git a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
index fc2824f..8662f8c 100644
--- a/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
@@ -1,26 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAction" id="logout_action">
- <property name="label" translatable="yes">_Logout</property>
- </object>
- <object class="GtkAction" id="publish_action">
- <property name="label" translatable="yes">_Publish</property>
- </object>
- <object class="GtkRadioAction" id="publish_new_radioaction">
- <property name="label" translatable="yes">A _new album</property>
- <property name="draw_as_radio">True</property>
- <property name="value">1</property>
- <property name="current_value">1</property>
- </object>
- <object class="GtkRadioAction" id="publish_to_existing_radioaction">
- <property name="label" translatable="yes">An _existing album</property>
- <property name="draw_as_radio">True</property>
- <property name="group">publish_new_radioaction</property>
- </object>
- <object class="GtkToggleAction" id="strip_metadata_toggleaction">
- <property name="label" translatable="yes">_Remove location, tag and camera-identifying data before uploading</property>
- </object>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkGrid" id="pane_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -28,15 +9,15 @@
<object class="GtkLabel" id="title_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.30000001192092896</property>
- <property name="ypad">16</property>
+ <property name="halign">start</property>
+ <property name="margin_top">16</property>
+ <property name="margin_bottom">16</property>
<property name="label">'Publishing to $url as $username' (populated in application code)</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -50,49 +31,43 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="publish_to_existing_radio">
- <property name="related_action">publish_to_existing_radioaction</property>
+ <property name="label" translatable="yes">An _existing album</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">publish_new_radio</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="existing_albums_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="publish_new_radio">
- <property name="related_action">publish_new_radioaction</property>
+ <property name="label" translatable="yes">A _new album</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -104,27 +79,25 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="strip_metadata_check">
- <property name="related_action">strip_metadata_toggleaction</property>
+ <property name="label" translatable="yes">_Remove location, tag and camera-identifying data before uploading</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="valign">center</property>
<property name="margin_top">16</property>
<property name="hexpand">True</property>
- <property name="xalign">0</property>
+ <property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -137,8 +110,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -155,8 +126,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -173,24 +142,18 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="scaling_constraint_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">Original size</item>
<item translatable="yes">Width or height</item>
@@ -199,8 +162,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -214,7 +175,6 @@
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -225,7 +185,6 @@
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -241,33 +200,31 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkButton" id="logout_button">
- <property name="related_action">logout_action</property>
+ <property name="label" translatable="yes">_Logout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="publish_button">
- <property name="related_action">publish_action</property>
+ <property name="label" translatable="yes">_Publish</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="is_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -275,7 +232,6 @@
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
index 439a754..2ef9f3d 100644
--- a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
+<interface domain="shotwell">
<requires lib="gtk+" version="3.14"/>
<object class="GtkWindow" id="authentication_pane">
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="content">
+ <object class="GtkBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">30</property>
<property name="margin_right">30</property>
- <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel" id="message_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label">label</property>
<property name="wrap">True</property>
- <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -29,60 +29,63 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="field_table">
+ <object class="GtkGrid" id="field_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
<property name="row_spacing">2</property>
+ <property name="column_spacing">8</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">_Email address</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username_entry</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">False</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">_Password</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
@@ -95,12 +98,11 @@
<child>
<object class="GtkCheckButton" id="remember_checkbutton">
<property name="label" translatable="yes">_Remember</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -110,7 +112,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
diff --git a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
index 374ca65..28011f1 100644
--- a/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkBox" id="rajce_pane_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36,7 +37,6 @@
<child>
<object class="GtkButton" id="logout_button">
<property name="label" translatable="yes">_Logout</property>
- <property name="use_action_appearance">False</property>
<property name="width_request">64</property>
<property name="height_request">24</property>
<property name="visible">True</property>
@@ -45,7 +45,6 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -82,14 +81,10 @@
<property name="width_request">320</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -102,23 +97,18 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="use_existing_radio">
<property name="label" translatable="yes">An _existing album:</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">create_new_radio</property>
@@ -126,86 +116,69 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="create_new_radio">
<property name="label" translatable="yes">A _new album named:</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.47999998927116394</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="hide_check">
<property name="label" translatable="yes">_Hide album</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="show_check">
<property name="label" translatable="yes">Open target _album in browser</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="publish_to_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="margin_top">4</property>
<property name="margin_bottom">8</property>
- <property name="xalign">0</property>
<property name="label">$mediatype will appear in</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -245,7 +218,6 @@
<child>
<object class="GtkButton" id="publish_button">
<property name="label" translatable="yes">_Publish</property>
- <property name="use_action_appearance">False</property>
<property name="width_request">96</property>
<property name="height_request">30</property>
<property name="visible">True</property>
@@ -255,7 +227,6 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
index 53262a3..6b17a54 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.4, the Vala compiler
* generated from shotwell-publishing-extras.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
index 9752a7c..24a647f 100644
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
-<interface>
- <requires lib="gtk+" version="3.0"/>
+<interface domain="shotwell">
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkWindow" id="authentication_pane">
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="content">
+ <object class="GtkBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">30</property>
<property name="margin_right">30</property>
- <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<object class="GtkLabel" id="message_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label">label</property>
<property name="wrap">True</property>
- <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -29,60 +29,63 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="field_table">
+ <object class="GtkGrid" id="field_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
<property name="row_spacing">2</property>
+ <property name="column_spacing">8</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">_Email address</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username_entry</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- <property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">False</property>
<property name="visibility">False</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">_Password</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
@@ -93,7 +96,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
diff --git a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
index ac201da..acc5459 100644
--- a/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkBox" id="tumblr_pane">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -16,7 +17,7 @@
<object class="GtkLabel" id="upload_info_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="no">You are logged into Tumblr as (name).
+ <property name="label">You are logged into Tumblr as (name).
(this label's string is populated and set inside the code,
so changes made here will not display)</property>
@@ -48,15 +49,13 @@ so changes made here will not display)</property>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="size_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Photo _size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">size_combo</property>
@@ -64,36 +63,26 @@ so changes made here will not display)</property>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="blog_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="size_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
@@ -114,12 +103,10 @@ so changes made here will not display)</property>
<child>
<object class="GtkButton" id="logout_button">
<property name="label" translatable="yes">_Logout</property>
- <property name="use_action_appearance">False</property>
<property name="width_request">96</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -132,12 +119,10 @@ so changes made here will not display)</property>
<child>
<object class="GtkButton" id="publish_button">
<property name="label" translatable="yes">_Publish</property>
- <property name="use_action_appearance">False</property>
<property name="width_request">96</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git a/plugins/shotwell-publishing-extras/yandex_publish_model.ui b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
index 1d9cc22..e1cc54d 100644
--- a/plugins/shotwell-publishing-extras/yandex_publish_model.ui
+++ b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
@@ -28,15 +28,18 @@
<object class="GtkWindow" id="publish_options_window">
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="content">
+ <object class="GtkBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="margin_left">30</property>
+ <property name="margin_right">30</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -44,25 +47,13 @@
<property name="label" translatable="yes">_Albums (or write new):</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">album_list</property>
- <property name="xalign">0.30000001192092896</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="ypad">6</property>
- <property name="label" translatable="yes">Access _type:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">access_type_list</property>
- <property name="xalign">0</property>
- </object>
- </child>
- <child>
<object class="GtkComboBoxText" id="access_type_list">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -70,8 +61,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_padding">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -82,10 +72,23 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_padding">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">6</property>
+ <property name="margin_right">6</property>
+ <property name="label" translatable="yes">Access _type:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">access_type_list</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -104,8 +107,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0.30000001192092896</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -121,8 +124,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0.30000001192092896</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -132,7 +135,7 @@
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>