From a7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Jan 2017 19:17:10 +0100 Subject: New upstream version 0.25.3 --- plugins/shotwell-publishing/PiwigoPublishing.c | 554 +++++++++++++------------ 1 file changed, 284 insertions(+), 270 deletions(-) (limited to 'plugins/shotwell-publishing/PiwigoPublishing.c') diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c index 8d06afe..820936f 100644 --- a/plugins/shotwell-publishing/PiwigoPublishing.c +++ b/plugins/shotwell-publishing/PiwigoPublishing.c @@ -1,4 +1,4 @@ -/* PiwigoPublishing.c generated by valac 0.32.1, the Vala compiler +/* PiwigoPublishing.c generated by valac 0.34.4, the Vala compiler * generated from PiwigoPublishing.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -583,7 +583,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi static const gchar* piwigo_service_real_get_id (SpitPluggable* base); static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base); static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info); -static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length); +static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length); static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled); static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host); PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host); @@ -846,7 +846,7 @@ enum { PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES, PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT }; -static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length); +static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length); static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self); static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher); static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base); @@ -1042,7 +1042,7 @@ static gpointer _g_object_ref0 (gpointer self) { } -static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length) { +static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) { GdkPixbuf** result; int i; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -1132,7 +1132,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp8__length1 = piwigo_service_icon_pixbuf_set_length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup13 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); + _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp9__length1 = _tmp8__length1; #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -5655,19 +5655,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 5664 "PiwigoPublishing.c" } @@ -8277,7 +8277,7 @@ static gpointer _publishing_piwigo_category_ref0 (gpointer self) { } -static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length) { +static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) { PublishingPiwigoCategory** result; int i; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -8343,7 +8343,7 @@ PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp6__length1 = categories_length1; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup14 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_); + _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup11 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_); #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp7__length1 = _tmp6__length1; #line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12238,72 +12238,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 12233 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; #line 12243 "PiwigoPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; #line 12253 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; #line 12259 "PiwigoPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; gint _tmp6__length1 = 0; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { #line 12270 "PiwigoPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7_ = str_array; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp7__length1 = str_array_length1; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_[0]; -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; #line 12282 "PiwigoPublishing.c" } else { -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; #line 12286 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; #line 12290 "PiwigoPublishing.c" } -#line 1057 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { #line 12294 "PiwigoPublishing.c" gint i = 0; @@ -12326,16 +12326,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 12317 "PiwigoPublishing.c" { gboolean _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = TRUE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 12326 "PiwigoPublishing.c" gboolean _tmp11_ = FALSE; @@ -12348,97 +12348,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 12339 "PiwigoPublishing.c" gint _tmp10_ = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; #line 12345 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp13__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { #line 12355 "PiwigoPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp15__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; #line 12367 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; #line 12371 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; #line 12377 "PiwigoPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; gint _tmp17__length1 = 0; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { #line 12388 "PiwigoPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; const gchar* _tmp20_ = NULL; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18_ = str_array; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp18__length1 = str_array_length1; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp19_ = i; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp20_ = _tmp18_[_tmp19_]; -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; #line 12403 "PiwigoPublishing.c" } else { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; #line 12407 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; #line 12411 "PiwigoPublishing.c" } -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { -#line 1060 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 12417 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22__length1 = str_array_length1; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp23_ = i; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp24_ = _tmp22_[_tmp23_]; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { #line 12429 "PiwigoPublishing.c" gchar** _tmp25_ = NULL; @@ -12447,91 +12447,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 12450 "PiwigoPublishing.c" } else { -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; #line 12454 "PiwigoPublishing.c" } -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; -#line 1061 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; #line 12460 "PiwigoPublishing.c" } } -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; -#line 1063 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { #line 12467 "PiwigoPublishing.c" gchar* _tmp32_ = NULL; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp32_; -#line 1064 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12475 "PiwigoPublishing.c" } -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" str_array_length1 = _tmp33_; -#line 1066 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp34_ = str_array_length1; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp35_ = len; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp36_ = separator; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp37_ = strlen ((const gchar*) _tmp36_); -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp38_ = _tmp37_; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp39_ = i; -#line 1067 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1)); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp40_ = len; -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp41_ = g_malloc (_tmp40_); -#line 1069 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = _tmp41_; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp42_ = res; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43_ = str_array; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp43__length1 = str_array_length1; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp44_ = _tmp43_[0]; -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); -#line 1070 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; #line 12513 "PiwigoPublishing.c" { gboolean _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = 1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = TRUE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { #line 12522 "PiwigoPublishing.c" gint _tmp48_ = 0; @@ -12547,94 +12547,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 12538 "PiwigoPublishing.c" gint _tmp47_ = 0; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; #line 12544 "PiwigoPublishing.c" } -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp48_ = i; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49_ = str_array; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp49__length1 = str_array_length1; -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!(_tmp48_ < _tmp49__length1)) { -#line 1071 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; #line 12558 "PiwigoPublishing.c" } -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp51_ = separator; -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_); -#line 1072 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp52_; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp54__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp55_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp56_ = _tmp54_[_tmp55_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { #line 12578 "PiwigoPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; const gchar* _tmp59_ = NULL; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57_ = str_array; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp57__length1 = str_array_length1; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp58_ = i; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp59_ = _tmp57_[_tmp58_]; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; #line 12593 "PiwigoPublishing.c" } else { -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; #line 12597 "PiwigoPublishing.c" } -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); -#line 1073 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; #line 12605 "PiwigoPublishing.c" } } -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp62_ = res; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" res = NULL; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = (gchar*) _tmp62_; -#line 1076 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12616 "PiwigoPublishing.c" } else { gchar* _tmp63_ = NULL; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp63_ = g_strdup (""); -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp63_; -#line 1078 "/usr/share/vala-0.32/vapi/glib-2.0.vapi" +#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; #line 12625 "PiwigoPublishing.c" } @@ -12686,30 +12686,31 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c gchar* comment = NULL; SpitPublishingPublishable* _tmp34_ = NULL; gchar* _tmp35_ = NULL; - const gchar* _tmp36_ = NULL; - PublishingPiwigoPublishingParameters* _tmp53_ = NULL; - PublishingPiwigoCategory* _tmp54_ = NULL; - gint _tmp55_ = 0; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - PublishingPiwigoPublishingParameters* _tmp58_ = NULL; - PublishingPiwigoPermissionLevel* _tmp59_ = NULL; - gint _tmp60_ = 0; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - PublishingPiwigoPublishingParameters* _tmp63_ = NULL; - gboolean _tmp64_ = FALSE; + gboolean _tmp36_ = FALSE; + const gchar* _tmp37_ = NULL; + PublishingPiwigoPublishingParameters* _tmp55_ = NULL; + PublishingPiwigoCategory* _tmp56_ = NULL; + gint _tmp57_ = 0; + gchar* _tmp58_ = NULL; + gchar* _tmp59_ = NULL; + PublishingPiwigoPublishingParameters* _tmp60_ = NULL; + PublishingPiwigoPermissionLevel* _tmp61_ = NULL; + gint _tmp62_ = 0; + gchar* _tmp63_ = NULL; + gchar* _tmp64_ = NULL; + PublishingPiwigoPublishingParameters* _tmp65_ = NULL; + gboolean _tmp66_ = FALSE; GHashTable* disposition_table = NULL; - GHashFunc _tmp67_ = NULL; - GEqualFunc _tmp68_ = NULL; - GHashTable* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - SpitPublishingPublishable* _tmp71_ = NULL; + GHashFunc _tmp69_ = NULL; + GEqualFunc _tmp70_ = NULL; + GHashTable* _tmp71_ = NULL; gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; + SpitPublishingPublishable* _tmp73_ = NULL; gchar* _tmp74_ = NULL; gchar* _tmp75_ = NULL; gchar* _tmp76_ = NULL; + gchar* _tmp77_ = NULL; + gchar* _tmp78_ = NULL; #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -12736,7 +12737,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession)); #line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp6_) { -#line 12725 "PiwigoPublishing.c" +#line 12726 "PiwigoPublishing.c" PublishingPiwigoSession* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; @@ -12758,7 +12759,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (_tmp11_); #line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (_tmp9_); -#line 12747 "PiwigoPublishing.c" +#line 12748 "PiwigoPublishing.c" } #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp12_ = parameters; @@ -12788,7 +12789,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _tmp18__length1 = keywords_length1; #line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" if (_tmp18_ != NULL) { -#line 12777 "PiwigoPublishing.c" +#line 12778 "PiwigoPublishing.c" gchar** _tmp19_ = NULL; gint _tmp19__length1 = 0; gchar* _tmp20_ = NULL; @@ -12802,7 +12803,7 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c _g_free0 (tags); #line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" tags = _tmp20_; -#line 12791 "PiwigoPublishing.c" +#line 12792 "PiwigoPublishing.c" } #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _tmp21_ = publishable; @@ -12846,191 +12847,204 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c #line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" comment = _tmp35_; #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp36_ = name; + _tmp37_ = name; +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + if (_tmp37_ == NULL) { +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp36_ = TRUE; +#line 12840 "PiwigoPublishing.c" + } else { + const gchar* _tmp38_ = NULL; +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + _tmp38_ = name; #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (g_strcmp0 (_tmp36_, "") != 0) { -#line 12837 "PiwigoPublishing.c" - SpitPublishingPublishable* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - const gchar* _tmp39_ = NULL; - gboolean _tmp40_ = FALSE; + _tmp36_ = g_strcmp0 (_tmp38_, "") == 0; +#line 12847 "PiwigoPublishing.c" + } +#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" + if (_tmp36_) { +#line 12851 "PiwigoPublishing.c" + SpitPublishingPublishable* _tmp39_ = NULL; + gchar* _tmp40_ = NULL; const gchar* _tmp41_ = NULL; + gboolean _tmp42_ = FALSE; + const gchar* _tmp43_ = NULL; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp37_ = publishable; + _tmp39_ = publishable; #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp38_ = spit_publishing_publishable_get_param_string (_tmp37_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); + _tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" _g_free0 (name); #line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - name = _tmp38_; + name = _tmp40_; #line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp39_ = name; + _tmp41_ = name; #line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp41_); #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp41_ = comment; + _tmp43_ = comment; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp41_ != NULL) { -#line 12859 "PiwigoPublishing.c" - const gchar* _tmp42_ = NULL; + if (_tmp43_ != NULL) { +#line 12873 "PiwigoPublishing.c" + const gchar* _tmp44_ = NULL; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp42_ = comment; + _tmp44_ = comment; #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp40_ = g_strcmp0 (_tmp42_, "") != 0; -#line 12865 "PiwigoPublishing.c" + _tmp42_ = g_strcmp0 (_tmp44_, "") != 0; +#line 12879 "PiwigoPublishing.c" } else { #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp40_ = FALSE; -#line 12869 "PiwigoPublishing.c" + _tmp42_ = FALSE; +#line 12883 "PiwigoPublishing.c" } #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp40_) { -#line 12873 "PiwigoPublishing.c" - const gchar* _tmp43_ = NULL; + if (_tmp42_) { +#line 12887 "PiwigoPublishing.c" + const gchar* _tmp45_ = NULL; #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp43_ = comment; + _tmp45_ = comment; #line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp43_); -#line 12879 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp45_); +#line 12893 "PiwigoPublishing.c" } } else { - gboolean _tmp44_ = FALSE; - const gchar* _tmp45_ = NULL; + gboolean _tmp46_ = FALSE; + const gchar* _tmp47_ = NULL; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp45_ = comment; + _tmp47_ = comment; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp45_ != NULL) { -#line 12888 "PiwigoPublishing.c" - const gchar* _tmp46_ = NULL; + if (_tmp47_ != NULL) { +#line 12902 "PiwigoPublishing.c" + const gchar* _tmp48_ = NULL; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp46_ = comment; + _tmp48_ = comment; #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp44_ = g_strcmp0 (_tmp46_, "") != 0; -#line 12894 "PiwigoPublishing.c" + _tmp46_ = g_strcmp0 (_tmp48_, "") != 0; +#line 12908 "PiwigoPublishing.c" } else { #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp44_ = FALSE; -#line 12898 "PiwigoPublishing.c" + _tmp46_ = FALSE; +#line 12912 "PiwigoPublishing.c" } #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp44_) { -#line 12902 "PiwigoPublishing.c" - const gchar* _tmp47_ = NULL; - const gchar* _tmp48_ = NULL; + if (_tmp46_) { +#line 12916 "PiwigoPublishing.c" + const gchar* _tmp49_ = NULL; + const gchar* _tmp50_ = NULL; #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp47_ = name; + _tmp49_ = name; #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp47_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp49_); #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp48_ = comment; + _tmp50_ = comment; #line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp48_); -#line 12913 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp50_); +#line 12927 "PiwigoPublishing.c" } else { - PublishingPiwigoPublishingParameters* _tmp49_ = NULL; - gboolean _tmp50_ = FALSE; + PublishingPiwigoPublishingParameters* _tmp51_ = NULL; + gboolean _tmp52_ = FALSE; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp49_ = parameters; + _tmp51_ = parameters; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp50_ = _tmp49_->title_as_comment; + _tmp52_ = _tmp51_->title_as_comment; #line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (_tmp50_) { -#line 12923 "PiwigoPublishing.c" - const gchar* _tmp51_ = NULL; + if (_tmp52_) { +#line 12937 "PiwigoPublishing.c" + const gchar* _tmp53_ = NULL; #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp51_ = name; + _tmp53_ = name; #line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp51_); -#line 12929 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp53_); +#line 12943 "PiwigoPublishing.c" } else { - const gchar* _tmp52_ = NULL; + const gchar* _tmp54_ = NULL; #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp52_ = name; + _tmp54_ = name; #line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp52_); -#line 12936 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp54_); +#line 12950 "PiwigoPublishing.c" } } } #line 1759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple"); #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp53_ = parameters; + _tmp55_ = parameters; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp54_ = _tmp53_->category; + _tmp56_ = _tmp55_->category; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp55_ = _tmp54_->id; + _tmp57_ = _tmp56_->id; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp56_ = g_strdup_printf ("%i", _tmp55_); + _tmp58_ = g_strdup_printf ("%i", _tmp57_); #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp57_ = _tmp56_; + _tmp59_ = _tmp58_; #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp57_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp59_); #line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp57_); + _g_free0 (_tmp59_); #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp58_ = parameters; + _tmp60_ = parameters; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp59_ = _tmp58_->perm_level; + _tmp61_ = _tmp60_->perm_level; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp60_ = _tmp59_->id; + _tmp62_ = _tmp61_->id; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp61_ = g_strdup_printf ("%i", _tmp60_); + _tmp63_ = g_strdup_printf ("%i", _tmp62_); #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp62_ = _tmp61_; + _tmp64_ = _tmp63_; #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp62_); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp64_); #line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp62_); + _g_free0 (_tmp64_); #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp63_ = parameters; + _tmp65_ = parameters; #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp64_ = _tmp63_->no_upload_tags; + _tmp66_ = _tmp65_->no_upload_tags; #line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (!_tmp64_) { -#line 12976 "PiwigoPublishing.c" - const gchar* _tmp65_ = NULL; + if (!_tmp66_) { +#line 12990 "PiwigoPublishing.c" + const gchar* _tmp67_ = NULL; #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp65_ = tags; + _tmp67_ = tags; #line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - if (g_strcmp0 (_tmp65_, "") != 0) { -#line 12982 "PiwigoPublishing.c" - const gchar* _tmp66_ = NULL; + if (g_strcmp0 (_tmp67_, "") != 0) { +#line 12996 "PiwigoPublishing.c" + const gchar* _tmp68_ = NULL; #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp66_ = tags; + _tmp68_ = tags; #line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp66_); -#line 12988 "PiwigoPublishing.c" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp68_); +#line 13002 "PiwigoPublishing.c" } } #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp67_ = g_str_hash; + _tmp69_ = g_str_hash; #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp68_ = g_str_equal; + _tmp70_ = g_str_equal; #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp69_ = g_hash_table_new_full (_tmp67_, _tmp68_, _g_free0_, _g_free0_); + _tmp71_ = g_hash_table_new_full (_tmp69_, _tmp70_, _g_free0_, _g_free0_); #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - disposition_table = _tmp69_; + disposition_table = _tmp71_; #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp70_ = g_strdup ("filename"); + _tmp72_ = g_strdup ("filename"); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp71_ = publishable; + _tmp73_ = publishable; #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp72_ = spit_publishing_publishable_get_param_string (_tmp71_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); + _tmp74_ = spit_publishing_publishable_get_param_string (_tmp73_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp73_ = _tmp72_; + _tmp75_ = _tmp74_; #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp74_ = soup_uri_encode (_tmp73_, NULL); + _tmp76_ = soup_uri_encode (_tmp75_, NULL); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_hash_table_insert (disposition_table, _tmp70_, _tmp74_); + g_hash_table_insert (disposition_table, _tmp72_, _tmp76_); #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _g_free0 (_tmp73_); + _g_free0 (_tmp75_); #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp75_ = g_strdup ("name"); + _tmp77_ = g_strdup ("name"); #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - _tmp76_ = g_strdup ("image"); + _tmp78_ = g_strdup ("image"); #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" - g_hash_table_insert (disposition_table, _tmp75_, _tmp76_); + g_hash_table_insert (disposition_table, _tmp77_, _tmp78_); #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" @@ -13045,14 +13059,14 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return self; -#line 13033 "PiwigoPublishing.c" +#line 13047 "PiwigoPublishing.c" } PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) { #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable); -#line 13040 "PiwigoPublishing.c" +#line 13054 "PiwigoPublishing.c" } @@ -13063,7 +13077,7 @@ static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwig ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize; #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate)); -#line 13051 "PiwigoPublishing.c" +#line 13065 "PiwigoPublishing.c" } @@ -13072,7 +13086,7 @@ static void publishing_piwigo_images_add_transaction_instance_init (PublishingPi self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self); #line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" self->priv->parameters = NULL; -#line 13060 "PiwigoPublishing.c" +#line 13074 "PiwigoPublishing.c" } @@ -13084,7 +13098,7 @@ static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSup _publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters); #line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj); -#line 13072 "PiwigoPublishing.c" +#line 13086 "PiwigoPublishing.c" } -- cgit v1.2.3