From 4a3f1fdfe1eb3743564adcee35d5513224339260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 25 Nov 2016 04:10:33 +0100 Subject: New upstream version 0.25.1 --- .../shotwell-publishing-extras/RajcePublishing.c | 3318 ++++++++++---------- .../RajcePublishing.vala | 5 +- .../shotwell-publishing-extras/TumblrPublishing.c | 2960 ++++++++--------- .../TumblrPublishing.vala | 9 +- .../shotwell-publishing-extras/YandexPublishing.c | 722 ++--- .../YandexPublishing.vala | 8 +- .../rajce_authentication_pane.ui | 202 +- .../tumblr_authentication_pane.ui | 181 +- .../yandex_publish_model.ui | 272 +- 9 files changed, 3859 insertions(+), 3818 deletions(-) (limited to 'plugins/shotwell-publishing-extras') diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c index c9311da..f7a1674 100644 --- a/plugins/shotwell-publishing-extras/RajcePublishing.c +++ b/plugins/shotwell-publishing-extras/RajcePublishing.c @@ -6387,10 +6387,10 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc GtkBuilder* _tmp1_ = NULL; GtkBuilder* _tmp2_ = NULL; GtkBuilder* _tmp3_ = NULL; - GtkAlignment* align = NULL; + GtkBox* content = NULL; GtkBuilder* _tmp4_ = NULL; GObject* _tmp5_ = NULL; - GtkAlignment* _tmp6_ = NULL; + GtkBox* _tmp6_ = NULL; GtkLabel* message_label = NULL; GtkBuilder* _tmp7_ = NULL; GObject* _tmp8_ = NULL; @@ -6438,12 +6438,16 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc GtkEntry* _tmp57_ = NULL; GtkEntry* _tmp58_ = NULL; GtkButton* _tmp59_ = NULL; - GtkAlignment* _tmp60_ = NULL; - GtkBox* _tmp61_ = NULL; - PublishingRajceRajcePublisher* _tmp62_ = NULL; - SpitPublishingPluginHost* _tmp63_ = NULL; - SpitPublishingPluginHost* _tmp64_ = NULL; - GtkButton* _tmp65_ = NULL; + GtkBox* _tmp60_ = NULL; + GtkContainer* _tmp61_ = NULL; + GtkContainer* _tmp62_ = NULL; + GtkBox* _tmp63_ = NULL; + GtkBox* _tmp64_ = NULL; + GtkBox* _tmp65_ = NULL; + PublishingRajceRajcePublisher* _tmp66_ = NULL; + SpitPublishingPluginHost* _tmp67_ = NULL; + SpitPublishingPluginHost* _tmp68_ = NULL; + GtkButton* _tmp69_ = NULL; #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = gtk_builder_new (); #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6456,7 +6460,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/rajce_authentication_pane.ui", &_inner_error_); #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 6456 "RajcePublishing.c" +#line 6460 "RajcePublishing.c" goto __catch29_g_error; } #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6466,11 +6470,11 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->builder; #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp5_ = gtk_builder_get_object (_tmp4_, "alignment"); + _tmp5_ = gtk_builder_get_object (_tmp4_, "content"); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp5_) : NULL); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_box_get_type ()) ? ((GtkBox*) _tmp5_) : NULL); #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - align = _tmp6_; + content = _tmp6_; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = self->priv->builder; #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6485,7 +6489,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc switch (_tmp10_) { #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO: -#line 6485 "RajcePublishing.c" +#line 6489 "RajcePublishing.c" { GtkLabel* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; @@ -6497,11 +6501,11 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc gtk_label_set_text (_tmp11_, _tmp12_); #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 6497 "RajcePublishing.c" +#line 6501 "RajcePublishing.c" } #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER: -#line 6501 "RajcePublishing.c" +#line 6505 "RajcePublishing.c" { GtkLabel* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; @@ -6524,12 +6528,12 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc _g_free0 (_tmp17_); #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 6524 "RajcePublishing.c" +#line 6528 "RajcePublishing.c" } default: #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 6529 "RajcePublishing.c" +#line 6533 "RajcePublishing.c" } #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = self->priv->builder; @@ -6551,7 +6555,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc _tmp23_ = persistent_username; #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp23_ != NULL) { -#line 6551 "RajcePublishing.c" +#line 6555 "RajcePublishing.c" GtkEntry* _tmp24_ = NULL; const gchar* _tmp25_ = NULL; #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6560,7 +6564,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc _tmp25_ = persistent_username; #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_entry_set_text (_tmp24_, _tmp25_); -#line 6560 "RajcePublishing.c" +#line 6564 "RajcePublishing.c" } #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = self->priv->builder; @@ -6582,7 +6586,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc _tmp31_ = persistent_token; #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp31_ != NULL) { -#line 6582 "RajcePublishing.c" +#line 6586 "RajcePublishing.c" GtkEntry* _tmp32_ = NULL; const gchar* _tmp33_ = NULL; #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6593,11 +6597,11 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc gtk_entry_set_text (_tmp32_, _tmp33_); #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->crypt = FALSE; -#line 6593 "RajcePublishing.c" +#line 6597 "RajcePublishing.c" } else { #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->crypt = TRUE; -#line 6597 "RajcePublishing.c" +#line 6601 "RajcePublishing.c" } #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp34_ = self->priv->builder; @@ -6680,23 +6684,33 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (_tmp59_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp60_ = align; + _tmp60_ = content; #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp61_ = self->priv->pane_widget; + _tmp61_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget)); #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget)); -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp62_ = publisher; -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp63_ = publishing_rajce_rajce_publisher_get_host (_tmp62_); -#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp64_ = _tmp63_; + _tmp62_ = _tmp61_; +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp63_ = content; +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_container_remove (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget)); #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp65_ = self->priv->login_button; + _tmp64_ = self->priv->pane_widget; #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - spit_publishing_plugin_host_set_dialog_default_widget (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget)); + _tmp65_ = content; #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (_tmp64_); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget)); +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp66_ = publisher; +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp67_ = publishing_rajce_rajce_publisher_get_host (_tmp66_); +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp68_ = _tmp67_; +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp69_ = self->priv->login_button; +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + spit_publishing_plugin_host_set_dialog_default_widget (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget)); +#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_object_unref0 (_tmp68_); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (label3); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6708,28 +6722,28 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (message_label); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (align); -#line 6709 "RajcePublishing.c" + _g_object_unref0 (content); +#line 6723 "RajcePublishing.c" } goto __finally29; __catch29_g_error: { GError* e = NULL; - GError* _tmp66_ = NULL; - const gchar* _tmp67_ = NULL; + GError* _tmp70_ = NULL; + const gchar* _tmp71_ = NULL; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" e = _inner_error_; #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _inner_error_ = NULL; -#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp66_ = e; -#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp67_ = _tmp66_->message; -#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_warning ("RajcePublishing.vala:905: Could not load UI: %s", _tmp67_); +#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp70_ = e; +#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp71_ = _tmp70_->message; +#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp71_); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (e); -#line 6729 "RajcePublishing.c" +#line 6743 "RajcePublishing.c" } __finally29: #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" @@ -6740,18 +6754,18 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc g_clear_error (&_inner_error_); #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 6740 "RajcePublishing.c" +#line 6754 "RajcePublishing.c" } #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 6744 "RajcePublishing.c" +#line 6758 "RajcePublishing.c" } PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) { #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_authentication_pane_construct (PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, publisher, mode); -#line 6751 "RajcePublishing.c" +#line 6765 "RajcePublishing.c" } @@ -6759,17 +6773,17 @@ GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRa GtkWidget* result = NULL; GtkButton* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self), NULL); -#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->login_button; -#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 6769 "RajcePublishing.c" +#line 6783 "RajcePublishing.c" } @@ -6784,68 +6798,68 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis const gchar* _tmp8_ = NULL; GtkCheckButton* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self)); -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->password_entry; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - token = _tmp2_; #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + token = _tmp2_; +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = self->priv->crypt; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp3_) { -#line 6798 "RajcePublishing.c" +#line 6812 "RajcePublishing.c" const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = token; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp4_, (gsize) -1); -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (token); -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" token = _tmp5_; -#line 6809 "RajcePublishing.c" +#line 6823 "RajcePublishing.c" } -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = self->priv->username_entry; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = token; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = self->priv->remember_checkbutton; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_emit_by_name (self, "login", _tmp7_, _tmp8_, _tmp10_); -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (token); -#line 6825 "RajcePublishing.c" +#line 6839 "RajcePublishing.c" } static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self) { -#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self)); -#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_update_login_button_sensitivity (self); -#line 6834 "RajcePublishing.c" +#line 6848 "RajcePublishing.c" } static void publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self) { -#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self)); -#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->crypt = TRUE; #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->crypt = TRUE; +#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_update_login_button_sensitivity (self); -#line 6845 "RajcePublishing.c" +#line 6859 "RajcePublishing.c" } @@ -6855,39 +6869,39 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity guint _tmp2_ = 0U; guint _tmp3_ = 0U; GtkButton* _tmp7_ = NULL; -#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self)); -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = self->priv->username_entry; -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = gtk_entry_get_text_length (_tmp1_); -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = _tmp2_; -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp3_ > ((guint) 0)) { -#line 6865 "RajcePublishing.c" +#line 6879 "RajcePublishing.c" GtkEntry* _tmp4_ = NULL; guint _tmp5_ = 0U; guint _tmp6_ = 0U; -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->password_entry; -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = gtk_entry_get_text_length (_tmp4_); -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = _tmp5_; -#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _tmp6_ > ((guint) 0); -#line 6877 "RajcePublishing.c" +#line 6891 "RajcePublishing.c" } else { -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; -#line 6881 "RajcePublishing.c" +#line 6895 "RajcePublishing.c" } -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = self->priv->login_button; -#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 6887 "RajcePublishing.c" +#line 6901 "RajcePublishing.c" } @@ -6896,30 +6910,30 @@ static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPubl GtkWidget* result = NULL; GtkBox* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->pane_widget; -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 6906 "RajcePublishing.c" +#line 6920 "RajcePublishing.c" } static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { PublishingRajceAuthenticationPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; -#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 6919 "RajcePublishing.c" +#line 6933 "RajcePublishing.c" } @@ -6928,31 +6942,31 @@ static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPub GtkEntry* _tmp0_ = NULL; GtkEntry* _tmp1_ = NULL; GtkButton* _tmp2_ = NULL; -#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); -#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->username_entry; -#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); +#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = self->priv->password_entry; -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_entry_set_activates_default (_tmp1_, TRUE); #line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_entry_set_activates_default (_tmp1_, TRUE); +#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = self->priv->login_button; -#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE); #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_update_login_button_sensitivity (self); -#line 6944 "RajcePublishing.c" +#line 6958 "RajcePublishing.c" } static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingRajceAuthenticationPane * self; -#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane); -#line 6952 "RajcePublishing.c" +#line 6966 "RajcePublishing.c" } @@ -6971,19 +6985,19 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * clos data1 = closure->data; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = param_values->data[0].v_pointer; -#line 6971 "RajcePublishing.c" +#line 6985 "RajcePublishing.c" } else { #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data1 = param_values->data[0].v_pointer; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = closure->data; -#line 6977 "RajcePublishing.c" +#line 6991 "RajcePublishing.c" } #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback = (GMarshalFunc_VOID__STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_boolean (param_values + 3), data2); -#line 6983 "RajcePublishing.c" +#line 6997 "RajcePublishing.c" } @@ -7012,7 +7026,7 @@ static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuth _tmp3_ = g_strdup (_tmp2_); #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_; -#line 7012 "RajcePublishing.c" +#line 7026 "RajcePublishing.c" } @@ -7027,7 +7041,7 @@ static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_int iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_on_pane_installed; #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_on_pane_uninstalled; -#line 7027 "RajcePublishing.c" +#line 7041 "RajcePublishing.c" } @@ -7038,7 +7052,7 @@ static void publishing_rajce_authentication_pane_instance_init (PublishingRajceA self->priv->pane_widget = NULL; #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->crypt = TRUE; -#line 7038 "RajcePublishing.c" +#line 7052 "RajcePublishing.c" } @@ -7060,7 +7074,7 @@ static void publishing_rajce_authentication_pane_finalize (GObject* obj) { _g_object_unref0 (self->priv->login_button); #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (publishing_rajce_authentication_pane_parent_class)->finalize (obj); -#line 7060 "RajcePublishing.c" +#line 7074 "RajcePublishing.c" } @@ -7083,65 +7097,65 @@ GType publishing_rajce_authentication_pane_get_type (void) { static gpointer _publishing_rajce_album_ref0 (gpointer self) { -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? publishing_rajce_album_ref (self) : NULL; -#line 7085 "RajcePublishing.c" +#line 7099 "RajcePublishing.c" } static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int length) { PublishingRajceAlbum** result; int i; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = g_new0 (PublishingRajceAlbum*, length + 1); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (i = 0; i < length; i++) { -#line 7096 "RajcePublishing.c" +#line 7110 "RajcePublishing.c" PublishingRajceAlbum* _tmp0_ = NULL; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _publishing_rajce_album_ref0 (self[i]); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result[i] = _tmp0_; -#line 7102 "RajcePublishing.c" +#line 7116 "RajcePublishing.c" } -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 7106 "RajcePublishing.c" +#line 7120 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7113 "RajcePublishing.c" +#line 7127 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_create_new_radio_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7120 "RajcePublishing.c" +#line 7134 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_new_album_entry_changed ((PublishingRajcePublishingOptionsPane*) self); -#line 7127 "RajcePublishing.c" +#line 7141 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_logout_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7134 "RajcePublishing.c" +#line 7148 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_publish_clicked ((PublishingRajcePublishingOptionsPane*) self); -#line 7141 "RajcePublishing.c" +#line 7155 "RajcePublishing.c" } @@ -7157,53 +7171,53 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c PublishingRajceRajcePublisher* _tmp5_ = NULL; GtkBox* _tmp6_ = NULL; GError * _inner_error_ = NULL; -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (publisher), NULL); -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (username != NULL, NULL); -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajcePublishingOptionsPane*) g_object_new (object_type, NULL); -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = username; -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->username); -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->username = _tmp1_; #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->username = _tmp1_; +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = albums; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2__length1 = albums_length1; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup5 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3__length1 = _tmp2__length1; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->albums = _tmp3_; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->albums_length1 = _tmp3__length1; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->_albums_size_ = self->priv->albums_length1; #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->_albums_size_ = self->priv->albums_length1; +#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = publisher; -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->publisher); -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->publisher = _tmp5_; #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->publisher = _tmp5_; +#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_object_ref_sink (_tmp6_); -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->pane_widget = _tmp6_; -#line 7203 "RajcePublishing.c" +#line 7217 "RajcePublishing.c" { GtkBuilder* _tmp7_ = NULL; GtkBuilder* _tmp8_ = NULL; @@ -7271,228 +7285,228 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c GtkEntry* _tmp70_ = NULL; GtkButton* _tmp71_ = NULL; GtkButton* _tmp72_ = NULL; -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = gtk_builder_new (); -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->builder); -#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->builder = _tmp7_; #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->builder = _tmp7_; +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = self->priv->builder; -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_builder_add_from_resource (_tmp8_, PLUGIN_RESOURCE_PATH "/rajce_publishing_options_pane.ui", &_inner_error_); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 7283 "RajcePublishing.c" +#line 7297 "RajcePublishing.c" goto __catch30_g_error; } -#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = self->priv->builder; -#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_builder_connect_signals (_tmp9_, NULL); -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = self->priv->builder; -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = gtk_builder_get_object (_tmp10_, "rajce_pane_widget"); -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox)); -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->pane_widget = _tmp12_; #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->pane_widget = _tmp12_; +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = self->priv->builder; -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "login_identity_label"); -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel)); -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->login_identity_label); -#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->login_identity_label = _tmp15_; #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->login_identity_label = _tmp15_; +#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = self->priv->builder; -#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = gtk_builder_get_object (_tmp16_, "publish_to_label"); -#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel)); -#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->publish_to_label); -#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->publish_to_label = _tmp18_; #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->publish_to_label = _tmp18_; +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp19_ = self->priv->builder; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp20_ = gtk_builder_get_object (_tmp19_, "use_existing_radio"); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_radio_button_get_type (), GtkRadioButton)); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->use_existing_radio); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->use_existing_radio = _tmp21_; #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->use_existing_radio = _tmp21_; +#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp22_ = self->priv->builder; -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = gtk_builder_get_object (_tmp22_, "existing_albums_combo"); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText)); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->existing_albums_combo); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->existing_albums_combo = _tmp24_; #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->existing_albums_combo = _tmp24_; +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp25_ = self->priv->builder; -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = gtk_builder_get_object (_tmp25_, "create_new_radio"); -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_radio_button_get_type (), GtkRadioButton)); -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->create_new_radio); -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->create_new_radio = _tmp27_; #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->create_new_radio = _tmp27_; +#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp28_ = self->priv->builder; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp29_ = gtk_builder_get_object (_tmp28_, "new_album_entry"); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_entry_get_type (), GtkEntry)); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->new_album_entry); -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->new_album_entry = _tmp30_; #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->new_album_entry = _tmp30_; +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp31_ = self->priv->builder; -#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp32_ = gtk_builder_get_object (_tmp31_, "hide_check"); -#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton)); -#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->hide_check); -#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->hide_check = _tmp33_; #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->hide_check = _tmp33_; +#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp34_ = self->priv->hide_check; -#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp35_ = _ ("_Hide album"); -#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _tmp35_); #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _tmp35_); +#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp36_ = self->priv->builder; -#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp37_ = gtk_builder_get_object (_tmp36_, "show_check"); -#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_check_button_get_type (), GtkCheckButton)); -#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->show_check); -#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->show_check = _tmp38_; #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->show_check = _tmp38_; +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp39_ = self->priv->builder; -#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp40_ = gtk_builder_get_object (_tmp39_, "publish_button"); -#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_button_get_type (), GtkButton)); -#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->publish_button); -#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->publish_button = _tmp41_; #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->publish_button = _tmp41_; +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp42_ = self->priv->builder; -#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp43_ = gtk_builder_get_object (_tmp42_, "logout_button"); -#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_button_get_type (), GtkButton)); -#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->logout_button); -#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->logout_button = _tmp44_; -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp45_ = self->priv->hide_check; -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp46_ = publisher; -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp47_ = publishing_rajce_rajce_publisher_get_hide_album (_tmp46_); -#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp47_); #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp47_); +#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp48_ = self->priv->show_check; -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp49_ = publisher; -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp50_ = publishing_rajce_rajce_publisher_get_show_album (_tmp49_); -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_); #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_); +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp51_ = self->priv->login_identity_label; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp52_ = _ ("You are logged into Rajce as %s."); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp53_ = username; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp54_ = g_strdup_printf (_tmp52_, _tmp53_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp55_ = _tmp54_; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_label_set_label (_tmp51_, _tmp55_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp55_); #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp55_); +#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp56_ = self->priv->publish_to_label; -#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp57_ = _ ("Photos will appear in:"); -#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_label_set_label (_tmp56_, _tmp57_); #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_label_set_label (_tmp56_, _tmp57_); +#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp58_ = self->priv->use_existing_radio; -#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp59_ = _ ("An _existing album:"); -#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_button_get_type (), GtkButton), _tmp59_); -#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _tmp60_ = self->priv->create_new_radio; #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_button_get_type (), GtkButton), _tmp59_); +#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _tmp60_ = self->priv->create_new_radio; +#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp61_ = _ ("A _new album named:"); -#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), _tmp61_); #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), _tmp61_); +#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp62_ = self->priv->show_check; -#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp63_ = _ ("Open target _album in browser"); -#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_button_get_type (), GtkButton), _tmp63_); #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_button_get_type (), GtkButton), _tmp63_); +#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp64_ = self->priv->publish_button; -#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp65_ = _ ("_Publish"); -#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_button_set_label (_tmp64_, _tmp65_); #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_button_set_label (_tmp64_, _tmp65_); +#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp66_ = self->priv->logout_button; -#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp67_ = _ ("_Logout"); -#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_button_set_label (_tmp66_, _tmp67_); -#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp68_ = self->priv->use_existing_radio; -#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0); +#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp69_ = self->priv->create_new_radio; -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0); +#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp70_ = self->priv->new_album_entry; -#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0); +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp71_ = self->priv->logout_button; -#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); +#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp72_ = self->priv->publish_button; -#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); -#line 7492 "RajcePublishing.c" +#line 7506 "RajcePublishing.c" } goto __finally30; __catch30_g_error: @@ -7500,41 +7514,41 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c GError* e = NULL; GError* _tmp73_ = NULL; const gchar* _tmp74_ = NULL; -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" e = _inner_error_; -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _inner_error_ = NULL; -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp73_ = e; -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp74_ = _tmp73_->message; -#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_warning ("RajcePublishing.vala:1028: Could not load UI: %s", _tmp74_); -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp74_); +#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (e); -#line 7512 "RajcePublishing.c" +#line 7526 "RajcePublishing.c" } __finally30: -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_clear_error (&_inner_error_); -#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 7523 "RajcePublishing.c" +#line 7537 "RajcePublishing.c" } -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 7527 "RajcePublishing.c" +#line 7541 "RajcePublishing.c" } PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) { -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_options_pane_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, publisher, username, albums, albums_length1); -#line 7534 "RajcePublishing.c" +#line 7548 "RajcePublishing.c" } @@ -7546,27 +7560,27 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish gboolean _tmp3_ = FALSE; GtkRadioButton* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->show_check; -#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - show_album = _tmp1_; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + show_album = _tmp1_; +#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = self->priv->publisher; -#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = show_album; -#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_rajce_publisher_set_show_album (_tmp2_, _tmp3_); #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_rajce_publisher_set_show_album (_tmp2_, _tmp3_); +#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->create_new_radio; -#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp5_) { -#line 7566 "RajcePublishing.c" +#line 7580 "RajcePublishing.c" gchar* album_name = NULL; GtkEntry* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -7580,41 +7594,41 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish gboolean _tmp14_ = FALSE; PublishingRajcePublishingParameters* _tmp15_ = NULL; PublishingRajcePublishingParameters* _tmp16_ = NULL; -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = self->priv->new_album_entry; -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = g_strdup (_tmp7_); -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - album_name = _tmp8_; #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + album_name = _tmp8_; +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = self->priv->hide_check; -#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - hide_album = _tmp10_; #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + hide_album = _tmp10_; +#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = self->priv->publisher; -#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = hide_album; -#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_rajce_publisher_set_hide_album (_tmp11_, _tmp12_); #line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_rajce_publisher_set_hide_album (_tmp11_, _tmp12_); +#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = album_name; -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = hide_album; -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = publishing_rajce_publishing_parameters_new_to_new_album (_tmp13_, _tmp14_); -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = _tmp15_; -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_emit_by_name (self, "publish", _tmp16_); -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_publishing_parameters_unref0 (_tmp16_); -#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (album_name); -#line 7614 "RajcePublishing.c" +#line 7628 "RajcePublishing.c" } else { gint id = 0; PublishingRajceAlbum** _tmp17_ = NULL; @@ -7635,51 +7649,51 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish gint _tmp29_ = 0; PublishingRajcePublishingParameters* _tmp30_ = NULL; PublishingRajcePublishingParameters* _tmp31_ = NULL; -#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = self->priv->albums; -#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17__length1 = self->priv->albums_length1; -#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = self->priv->existing_albums_combo; -#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp19_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox)); -#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp20_ = _tmp17_[_tmp19_]; -#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp21_ = _tmp20_->id; -#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - id = _tmp21_; #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + id = _tmp21_; +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp22_ = self->priv->albums; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp22__length1 = self->priv->albums_length1; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = self->priv->existing_albums_combo; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox)); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp25_ = _tmp22_[_tmp24_]; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = _tmp25_->albumName; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp27_ = g_strdup (_tmp26_); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - album_name = _tmp27_; #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + album_name = _tmp27_; +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp28_ = album_name; -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp29_ = id; -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp30_ = publishing_rajce_publishing_parameters_new_to_existing_album (_tmp28_, _tmp29_); -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp31_ = _tmp30_; -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_emit_by_name (self, "publish", _tmp31_); -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_publishing_parameters_unref0 (_tmp31_); -#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (album_name); -#line 7679 "RajcePublishing.c" +#line 7693 "RajcePublishing.c" } } @@ -7689,27 +7703,27 @@ static void publishing_rajce_publishing_options_pane_on_use_existing_radio_click GtkEntry* _tmp1_ = NULL; GtkComboBoxText* _tmp2_ = NULL; GtkCheckButton* _tmp3_ = NULL; -#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->existing_albums_combo; -#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); #line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = self->priv->new_album_entry; -#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = self->priv->existing_albums_combo; -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self); + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self); +#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = self->priv->hide_check; -#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 7709 "RajcePublishing.c" +#line 7723 "RajcePublishing.c" } @@ -7718,36 +7732,36 @@ static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked GtkComboBoxText* _tmp1_ = NULL; GtkEntry* _tmp2_ = NULL; GtkCheckButton* _tmp3_ = NULL; -#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->new_album_entry; -#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = self->priv->existing_albums_combo; -#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = self->priv->new_album_entry; -#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self); + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget)); #line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self); +#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = self->priv->hide_check; -#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 7738 "RajcePublishing.c" +#line 7752 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self) { -#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 7747 "RajcePublishing.c" +#line 7761 "RajcePublishing.c" } @@ -7770,7 +7784,7 @@ static gchar* string_strip (const gchar* self) { result = _result_; #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 7770 "RajcePublishing.c" +#line 7784 "RajcePublishing.c" } @@ -7785,58 +7799,58 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi gchar* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; GtkButton* _tmp10_ = NULL; -#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->new_album_entry; -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - album_name = _tmp2_; #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + album_name = _tmp2_; +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = album_name; -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = string_strip (_tmp4_); -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = _tmp5_; -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = g_strcmp0 (_tmp6_, "") != 0; -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp6_); -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp7_) { -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = TRUE; -#line 7809 "RajcePublishing.c" +#line 7823 "RajcePublishing.c" } else { GtkRadioButton* _tmp8_ = NULL; gboolean _tmp9_ = FALSE; -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = self->priv->create_new_radio; -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton)); -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = !_tmp9_; -#line 7819 "RajcePublishing.c" +#line 7833 "RajcePublishing.c" } -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = self->priv->publish_button; -#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp3_); -#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (album_name); -#line 7827 "RajcePublishing.c" +#line 7841 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self) { -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self); -#line 7836 "RajcePublishing.c" +#line 7850 "RajcePublishing.c" } @@ -7844,21 +7858,21 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi PublishingRajceAlbum** _tmp9_ = NULL; gint _tmp9__length1 = 0; GtkRadioButton* _tmp15_ = NULL; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 7846 "RajcePublishing.c" +#line 7860 "RajcePublishing.c" { gint i = 0; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" i = 0; -#line 7851 "RajcePublishing.c" +#line 7865 "RajcePublishing.c" { gboolean _tmp0_ = FALSE; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = TRUE; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" while (TRUE) { -#line 7858 "RajcePublishing.c" +#line 7872 "RajcePublishing.c" gint _tmp2_ = 0; PublishingRajceAlbum** _tmp3_ = NULL; gint _tmp3__length1 = 0; @@ -7868,114 +7882,114 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi gint _tmp6_ = 0; PublishingRajceAlbum* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!_tmp0_) { -#line 7870 "RajcePublishing.c" +#line 7884 "RajcePublishing.c" gint _tmp1_ = 0; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = i; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" i = _tmp1_ + 1; -#line 7876 "RajcePublishing.c" +#line 7890 "RajcePublishing.c" } -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = i; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = self->priv->albums; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3__length1 = self->priv->albums_length1; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!(_tmp2_ < _tmp3__length1)) { -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" break; -#line 7890 "RajcePublishing.c" +#line 7904 "RajcePublishing.c" } -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->existing_albums_combo; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = self->priv->albums; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5__length1 = self->priv->albums_length1; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = i; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = _tmp5_[_tmp6_]; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = _tmp7_->albumName; -#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_combo_box_text_append_text (_tmp4_, _tmp8_); -#line 7906 "RajcePublishing.c" +#line 7920 "RajcePublishing.c" } } } -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = self->priv->albums; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9__length1 = self->priv->albums_length1; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp9__length1 == 0) { -#line 7916 "RajcePublishing.c" +#line 7930 "RajcePublishing.c" GtkComboBoxText* _tmp10_ = NULL; GtkRadioButton* _tmp11_ = NULL; -#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = self->priv->existing_albums_combo; -#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE); #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = self->priv->use_existing_radio; -#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 7927 "RajcePublishing.c" +#line 7941 "RajcePublishing.c" } else { GtkComboBoxText* _tmp12_ = NULL; GtkComboBoxText* _tmp13_ = NULL; GtkRadioButton* _tmp14_ = NULL; -#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = self->priv->existing_albums_combo; -#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0); #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0); +#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = self->priv->existing_albums_combo; -#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), TRUE); #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = self->priv->use_existing_radio; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE); -#line 7944 "RajcePublishing.c" +#line 7958 "RajcePublishing.c" } -#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = self->priv->create_new_radio; -#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); #line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE); +#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (self); -#line 7952 "RajcePublishing.c" +#line 7966 "RajcePublishing.c" } void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters) { PublishingRajcePublishingParameters* _tmp0_ = NULL; -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters)); -#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = parameters; -#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_emit_by_name (self, "publish", _tmp0_); -#line 7966 "RajcePublishing.c" +#line 7980 "RajcePublishing.c" } void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self) { -#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 7975 "RajcePublishing.c" +#line 7989 "RajcePublishing.c" } @@ -7983,17 +7997,17 @@ GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (Publishi GtkWidget* result = NULL; GtkButton* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self), NULL); -#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->logout_button; -#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 7993 "RajcePublishing.c" +#line 8007 "RajcePublishing.c" } @@ -8002,58 +8016,58 @@ static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (Spit GtkWidget* result = NULL; GtkBox* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->pane_widget; -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8012 "RajcePublishing.c" +#line 8026 "RajcePublishing.c" } static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { PublishingRajcePublishingOptionsPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; -#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); -#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8025 "RajcePublishing.c" +#line 8039 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) { -#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_notify_publish ((PublishingRajcePublishingOptionsPane*) self, parameters); -#line 8032 "RajcePublishing.c" +#line 8046 "RajcePublishing.c" } static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) { -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_notify_logout ((PublishingRajcePublishingOptionsPane*) self); -#line 8039 "RajcePublishing.c" +#line 8053 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingRajcePublishingOptionsPane * self; -#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); -#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_publishing_options_pane_installed (self); #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_connect_object (self, "publish", (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self, 0); + publishing_rajce_publishing_options_pane_installed (self); #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_signal_connect_object (self, "publish", (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self, 0); +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_connect_object (self, "logout", (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self, 0); -#line 8053 "RajcePublishing.c" +#line 8067 "RajcePublishing.c" } @@ -8061,17 +8075,17 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (S PublishingRajcePublishingOptionsPane * self; guint _tmp0_ = 0U; guint _tmp1_ = 0U; -#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_parse_name ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self); #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self); +#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_parse_name ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); -#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self); -#line 8071 "RajcePublishing.c" +#line 8085 "RajcePublishing.c" } @@ -8082,128 +8096,128 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS register gpointer data1; register gpointer data2; cc = (GCClosure *) closure; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (n_param_values == 2); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_CCLOSURE_SWAP_DATA (closure)) { -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data1 = closure->data; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = param_values->data[0].v_pointer; -#line 8090 "RajcePublishing.c" +#line 8104 "RajcePublishing.c" } else { -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data1 = param_values->data[0].v_pointer; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" data2 = closure->data; -#line 8096 "RajcePublishing.c" +#line 8110 "RajcePublishing.c" } -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback = (GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" callback (data1, publishing_rajce_value_get_publishing_parameters (param_values + 1), data2); -#line 8102 "RajcePublishing.c" +#line 8116 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_class_init (PublishingRajcePublishingOptionsPaneClass * klass) { -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_parent_class = g_type_class_peek_parent (klass); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajcePublishingOptionsPanePrivate)); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_rajce_publishing_options_pane_finalize; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_new ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_new ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 8117 "RajcePublishing.c" +#line 8131 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_widget; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_preferred_geometry; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_on_pane_installed; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_on_pane_uninstalled; -#line 8132 "RajcePublishing.c" +#line 8146 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_instance_init (PublishingRajcePublishingOptionsPane * self) { -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv = PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); -#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->builder = NULL; #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->pane_widget = NULL; + self->priv->builder = NULL; #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->login_identity_label = NULL; + self->priv->pane_widget = NULL; #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->publish_to_label = NULL; + self->priv->login_identity_label = NULL; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->use_existing_radio = NULL; + self->priv->publish_to_label = NULL; #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->existing_albums_combo = NULL; + self->priv->use_existing_radio = NULL; #line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->create_new_radio = NULL; + self->priv->existing_albums_combo = NULL; #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->new_album_entry = NULL; + self->priv->create_new_radio = NULL; #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->hide_check = NULL; + self->priv->new_album_entry = NULL; #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->show_check = NULL; + self->priv->hide_check = NULL; #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->publish_button = NULL; + self->priv->show_check = NULL; #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->publish_button = NULL; +#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->logout_button = NULL; -#line 8163 "RajcePublishing.c" +#line 8177 "RajcePublishing.c" } static void publishing_rajce_publishing_options_pane_finalize (GObject* obj) { PublishingRajcePublishingOptionsPane * self; -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane); -#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->publisher); #line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL); + _g_object_unref0 (self->priv->publisher); #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL); +#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->username); -#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->builder); #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->pane_widget); + _g_object_unref0 (self->priv->builder); #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->login_identity_label); + _g_object_unref0 (self->priv->pane_widget); #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->publish_to_label); + _g_object_unref0 (self->priv->login_identity_label); #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->use_existing_radio); + _g_object_unref0 (self->priv->publish_to_label); #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->existing_albums_combo); + _g_object_unref0 (self->priv->use_existing_radio); #line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->create_new_radio); + _g_object_unref0 (self->priv->existing_albums_combo); #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->new_album_entry); + _g_object_unref0 (self->priv->create_new_radio); #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->hide_check); + _g_object_unref0 (self->priv->new_album_entry); #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->show_check); + _g_object_unref0 (self->priv->hide_check); #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_object_unref0 (self->priv->publish_button); + _g_object_unref0 (self->priv->show_check); #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_object_unref0 (self->priv->publish_button); +#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (self->priv->logout_button); -#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_OBJECT_CLASS (publishing_rajce_publishing_options_pane_parent_class)->finalize (obj); -#line 8203 "RajcePublishing.c" +#line 8217 "RajcePublishing.c" } @@ -8223,18 +8237,18 @@ GType publishing_rajce_publishing_options_pane_get_type (void) { static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct (GType object_type) { PublishingRajcePublishingParameters* self = NULL; -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type); -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8227 "RajcePublishing.c" +#line 8241 "RajcePublishing.c" } static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void) { -#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_parameters_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS); -#line 8234 "RajcePublishing.c" +#line 8248 "RajcePublishing.c" } @@ -8246,44 +8260,44 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons gboolean* _tmp3_ = NULL; gint _tmp4_ = 0; gint* _tmp5_ = NULL; -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (album_name != NULL, NULL); -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = album_name; -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_name); -#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->album_name = _tmp1_; #line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->album_name = _tmp1_; +#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = album_hidden; -#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = __bool_dup0 (&_tmp2_); -#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_hidden); -#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->album_hidden = _tmp3_; #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->album_hidden = _tmp3_; +#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = 0; -#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = __int_dup0 (&_tmp4_); -#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_id); -#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->album_id = _tmp5_; -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8276 "RajcePublishing.c" +#line 8290 "RajcePublishing.c" } PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name, gboolean album_hidden) { -#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_parameters_construct_to_new_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_hidden); -#line 8283 "RajcePublishing.c" +#line 8297 "RajcePublishing.c" } @@ -8293,252 +8307,252 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons gchar* _tmp1_ = NULL; gint _tmp2_ = 0; gint* _tmp3_ = NULL; -#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (album_name != NULL, NULL); -#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type); -#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = album_name; -#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_name); -#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->album_name = _tmp1_; #line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->album_name = _tmp1_; +#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_hidden); -#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->album_hidden = NULL; #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->album_hidden = NULL; +#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = album_id; -#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = __int_dup0 (&_tmp2_); -#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_id); -#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->album_id = _tmp3_; -#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8319 "RajcePublishing.c" +#line 8333 "RajcePublishing.c" } PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name, gint album_id) { -#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_publishing_parameters_construct_to_existing_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_id); -#line 8326 "RajcePublishing.c" +#line 8340 "RajcePublishing.c" } static void publishing_rajce_value_publishing_parameters_init (GValue* value) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8333 "RajcePublishing.c" +#line 8347 "RajcePublishing.c" } static void publishing_rajce_value_publishing_parameters_free_value (GValue* value) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (value->data[0].v_pointer) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_unref (value->data[0].v_pointer); -#line 8342 "RajcePublishing.c" +#line 8356 "RajcePublishing.c" } } static void publishing_rajce_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (src_value->data[0].v_pointer) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (src_value->data[0].v_pointer); -#line 8352 "RajcePublishing.c" +#line 8366 "RajcePublishing.c" } else { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 8356 "RajcePublishing.c" +#line 8370 "RajcePublishing.c" } } static gpointer publishing_rajce_value_publishing_parameters_peek_pointer (const GValue* value) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 8364 "RajcePublishing.c" +#line 8378 "RajcePublishing.c" } static gchar* publishing_rajce_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (collect_values[0].v_pointer) { -#line 8371 "RajcePublishing.c" +#line 8385 "RajcePublishing.c" PublishingRajcePublishingParameters* object; object = collect_values[0].v_pointer; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 8378 "RajcePublishing.c" +#line 8392 "RajcePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 8382 "RajcePublishing.c" +#line 8396 "RajcePublishing.c" } -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (object); -#line 8386 "RajcePublishing.c" +#line 8400 "RajcePublishing.c" } else { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8390 "RajcePublishing.c" +#line 8404 "RajcePublishing.c" } -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 8394 "RajcePublishing.c" +#line 8408 "RajcePublishing.c" } static gchar* publishing_rajce_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PublishingRajcePublishingParameters** object_p; object_p = collect_values[0].v_pointer; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!object_p) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 8405 "RajcePublishing.c" +#line 8419 "RajcePublishing.c" } -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!value->data[0].v_pointer) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = NULL; -#line 8411 "RajcePublishing.c" +#line 8425 "RajcePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = value->data[0].v_pointer; -#line 8415 "RajcePublishing.c" +#line 8429 "RajcePublishing.c" } else { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer); -#line 8419 "RajcePublishing.c" +#line 8433 "RajcePublishing.c" } -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 8423 "RajcePublishing.c" +#line 8437 "RajcePublishing.c" } GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PublishingRajceParamSpecPublishingParameters* spec; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return G_PARAM_SPEC (spec); -#line 8437 "RajcePublishing.c" +#line 8451 "RajcePublishing.c" } gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 8446 "RajcePublishing.c" +#line 8460 "RajcePublishing.c" } void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object) { PublishingRajcePublishingParameters* old; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS)); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" old = value->data[0].v_pointer; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (v_object) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS)); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer); -#line 8466 "RajcePublishing.c" +#line 8480 "RajcePublishing.c" } else { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8470 "RajcePublishing.c" +#line 8484 "RajcePublishing.c" } -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_unref (old); -#line 8476 "RajcePublishing.c" +#line 8490 "RajcePublishing.c" } } void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object) { PublishingRajcePublishingParameters* old; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS)); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" old = value->data[0].v_pointer; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (v_object) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS)); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 8495 "RajcePublishing.c" +#line 8509 "RajcePublishing.c" } else { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 8499 "RajcePublishing.c" +#line 8513 "RajcePublishing.c" } -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_unref (old); -#line 8505 "RajcePublishing.c" +#line 8519 "RajcePublishing.c" } } static void publishing_rajce_publishing_parameters_class_init (PublishingRajcePublishingParametersClass * klass) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_publishing_parameters_parent_class = g_type_class_peek_parent (klass); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRajcePublishingParametersClass *) klass)->finalize = publishing_rajce_publishing_parameters_finalize; -#line 8515 "RajcePublishing.c" +#line 8529 "RajcePublishing.c" } static void publishing_rajce_publishing_parameters_instance_init (PublishingRajcePublishingParameters * self) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->ref_count = 1; -#line 8522 "RajcePublishing.c" +#line 8536 "RajcePublishing.c" } static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters* obj) { PublishingRajcePublishingParameters * self; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, PublishingRajcePublishingParameters); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_handlers_destroy (self); -#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->album_name); #line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->album_hidden); + _g_free0 (self->album_name); #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (self->album_hidden); +#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->album_id); -#line 8538 "RajcePublishing.c" +#line 8552 "RajcePublishing.c" } @@ -8559,42 +8573,42 @@ GType publishing_rajce_publishing_parameters_get_type (void) { gpointer publishing_rajce_publishing_parameters_ref (gpointer instance) { PublishingRajcePublishingParameters* self; self = instance; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return instance; -#line 8563 "RajcePublishing.c" +#line 8577 "RajcePublishing.c" } void publishing_rajce_publishing_parameters_unref (gpointer instance) { PublishingRajcePublishingParameters* self; self = instance; -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self); -#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 8576 "RajcePublishing.c" +#line 8590 "RajcePublishing.c" } } PublishingRajceSession* publishing_rajce_session_construct (GType object_type) { PublishingRajceSession* self = NULL; -#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajceSession*) publishing_rest_support_session_construct (object_type, ""); -#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8587 "RajcePublishing.c" +#line 8601 "RajcePublishing.c" } PublishingRajceSession* publishing_rajce_session_new (void) { -#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_session_construct (PUBLISHING_RAJCE_TYPE_SESSION); -#line 8594 "RajcePublishing.c" +#line 8608 "RajcePublishing.c" } @@ -8604,43 +8618,43 @@ static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSu gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gint* _tmp2_ = NULL; -#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession); -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = self->priv->userid; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp2_ != NULL) { -#line 8610 "RajcePublishing.c" +#line 8624 "RajcePublishing.c" const gchar* _tmp3_ = NULL; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = self->priv->usertoken; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _tmp3_ != NULL; -#line 8616 "RajcePublishing.c" +#line 8630 "RajcePublishing.c" } else { -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = FALSE; -#line 8620 "RajcePublishing.c" +#line 8634 "RajcePublishing.c" } -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp1_) { -#line 8624 "RajcePublishing.c" +#line 8638 "RajcePublishing.c" const gchar* _tmp4_ = NULL; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = self->priv->username; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = _tmp4_ != NULL; -#line 8630 "RajcePublishing.c" +#line 8644 "RajcePublishing.c" } else { -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = FALSE; -#line 8634 "RajcePublishing.c" +#line 8648 "RajcePublishing.c" } -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp0_; -#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8640 "RajcePublishing.c" +#line 8654 "RajcePublishing.c" } @@ -8655,139 +8669,139 @@ void publishing_rajce_session_authenticate (PublishingRajceSession* self, const gint* _tmp7_ = NULL; gint _tmp8_ = 0; gint* _tmp9_ = NULL; -#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); -#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (token != NULL); -#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (name != NULL); -#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = token; -#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->usertoken); -#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->usertoken = _tmp1_; #line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->usertoken = _tmp1_; +#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = name; -#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->username); -#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->username = _tmp3_; #line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->username = _tmp3_; +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = id; -#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = __int_dup0 (&_tmp4_); -#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->userid); -#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->userid = _tmp5_; #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->userid = _tmp5_; +#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = maxsize; -#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = __int_dup0 (&_tmp6_); -#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->maxsize); -#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->maxsize = _tmp7_; #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->maxsize = _tmp7_; +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = quality; -#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = __int_dup0 (&_tmp8_); -#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->quality); -#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->quality = _tmp9_; -#line 8701 "RajcePublishing.c" +#line 8715 "RajcePublishing.c" } void publishing_rajce_session_deauthenticate (PublishingRajceSession* self) { -#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); -#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->usertoken); -#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->usertoken = NULL; #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->usertoken = NULL; +#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->albumtoken); -#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->albumtoken = NULL; #line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->albumtoken = NULL; +#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->albumticket); -#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->albumticket = NULL; #line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->albumticket = NULL; +#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->username); -#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->username = NULL; #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->username = NULL; +#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->userid); -#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->userid = NULL; #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->userid = NULL; +#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->maxsize); -#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->maxsize = NULL; #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->maxsize = NULL; +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->quality); -#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->quality = NULL; -#line 8736 "RajcePublishing.c" +#line 8750 "RajcePublishing.c" } void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken) { const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = usertoken; -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->usertoken); -#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->usertoken = _tmp1_; -#line 8753 "RajcePublishing.c" +#line 8767 "RajcePublishing.c" } void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken) { const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = albumtoken; -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->albumtoken); -#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->albumtoken = _tmp1_; -#line 8770 "RajcePublishing.c" +#line 8784 "RajcePublishing.c" } void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket) { const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self)); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = albumticket; -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->albumticket); -#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->albumticket = _tmp1_; -#line 8787 "RajcePublishing.c" +#line 8801 "RajcePublishing.c" } @@ -8795,17 +8809,17 @@ gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->usertoken; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8805 "RajcePublishing.c" +#line 8819 "RajcePublishing.c" } @@ -8813,17 +8827,17 @@ gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); -#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->albumtoken; -#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8823 "RajcePublishing.c" +#line 8837 "RajcePublishing.c" } @@ -8831,17 +8845,17 @@ gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->albumticket; -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8841 "RajcePublishing.c" +#line 8855 "RajcePublishing.c" } @@ -8849,90 +8863,90 @@ gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) { gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL); -#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->username; -#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp1_; -#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8859 "RajcePublishing.c" +#line 8873 "RajcePublishing.c" } gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) { gint result = 0; gint* _tmp0_ = NULL; -#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), 0); -#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->maxsize; -#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = *_tmp0_; -#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 8874 "RajcePublishing.c" +#line 8888 "RajcePublishing.c" } static void publishing_rajce_session_class_init (PublishingRajceSessionClass * klass) { -#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_session_parent_class = g_type_class_peek_parent (klass); -#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rajce_session_finalize; -#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceSessionPrivate)); -#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rajce_session_real_is_authenticated; -#line 8887 "RajcePublishing.c" +#line 8901 "RajcePublishing.c" } static void publishing_rajce_session_instance_init (PublishingRajceSession * self) { -#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv = PUBLISHING_RAJCE_SESSION_GET_PRIVATE (self); #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->usertoken = NULL; + self->priv = PUBLISHING_RAJCE_SESSION_GET_PRIVATE (self); #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->albumtoken = NULL; + self->priv->usertoken = NULL; #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->albumticket = NULL; + self->priv->albumtoken = NULL; #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->username = NULL; + self->priv->albumticket = NULL; #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->userid = NULL; + self->priv->username = NULL; #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->maxsize = NULL; + self->priv->userid = NULL; #line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->maxsize = NULL; +#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->quality = NULL; -#line 8908 "RajcePublishing.c" +#line 8922 "RajcePublishing.c" } static void publishing_rajce_session_finalize (PublishingRESTSupportSession* obj) { PublishingRajceSession * self; -#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession); #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->priv->usertoken); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession); #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->priv->albumtoken); + _g_free0 (self->priv->usertoken); #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->priv->albumticket); + _g_free0 (self->priv->albumtoken); #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->priv->username); + _g_free0 (self->priv->albumticket); #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->priv->userid); + _g_free0 (self->priv->username); #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->priv->maxsize); + _g_free0 (self->priv->userid); #line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (self->priv->maxsize); +#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->quality); -#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rajce_session_parent_class)->finalize (obj); -#line 8932 "RajcePublishing.c" +#line 8946 "RajcePublishing.c" } @@ -8952,9 +8966,9 @@ GType publishing_rajce_session_get_type (void) { static gpointer _publishing_rajce_arg_item_ref0 (gpointer self) { -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self ? publishing_rajce_arg_item_ref (self) : NULL; -#line 8954 "RajcePublishing.c" +#line 8968 "RajcePublishing.c" } @@ -8965,61 +8979,61 @@ PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type, const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; PublishingRajceArgItem** _tmp4_ = NULL; -#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajceArgItem*) g_type_create_instance (object_type); -#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = k; -#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->key); -#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->key = _tmp1_; #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->key = _tmp1_; +#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = v; -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->val); -#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->val = _tmp3_; #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->val = _tmp3_; +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = g_new0 (PublishingRajceArgItem*, 0 + 1); -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->children = _tmp4_; -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->children_length1 = 0; -#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->_children_size_ = self->children_length1; -#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 8995 "RajcePublishing.c" +#line 9009 "RajcePublishing.c" } PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v) { -#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_arg_item_construct (PUBLISHING_RAJCE_TYPE_ARG_ITEM, k, v); -#line 9002 "RajcePublishing.c" +#line 9016 "RajcePublishing.c" } static void _vala_array_add6 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 9013 "RajcePublishing.c" +#line 9027 "RajcePublishing.c" } -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 9019 "RajcePublishing.c" +#line 9033 "RajcePublishing.c" } @@ -9028,62 +9042,62 @@ void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, Publishin gint _tmp0__length1 = 0; PublishingRajceArgItem* _tmp1_ = NULL; PublishingRajceArgItem* _tmp2_ = NULL; -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self)); -#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (child)); -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->children; -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0__length1 = self->children_length1; -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = child; -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = _publishing_rajce_arg_item_ref0 (_tmp1_); -#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _vala_array_add6 (&self->children, &self->children_length1, &self->_children_size_, _tmp2_); -#line 9042 "RajcePublishing.c" +#line 9056 "RajcePublishing.c" } void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1) { PublishingRajceArgItem** _tmp0_ = NULL; gint _tmp0__length1 = 0; -#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self)); -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = newchildren; -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0__length1 = newchildren_length1; -#line 9055 "RajcePublishing.c" +#line 9069 "RajcePublishing.c" { PublishingRajceArgItem** child_collection = NULL; gint child_collection_length1 = 0; gint _child_collection_size_ = 0; gint child_it = 0; -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child_collection = _tmp0_; -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child_collection_length1 = _tmp0__length1; -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) { -#line 9067 "RajcePublishing.c" +#line 9081 "RajcePublishing.c" PublishingRajceArgItem* _tmp1_ = NULL; PublishingRajceArgItem* child = NULL; -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]); -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child = _tmp1_; -#line 9074 "RajcePublishing.c" +#line 9088 "RajcePublishing.c" { PublishingRajceArgItem* _tmp2_ = NULL; -#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = child; -#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_AddChild (self, _tmp2_); -#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); -#line 9083 "RajcePublishing.c" +#line 9097 "RajcePublishing.c" } } } @@ -9091,198 +9105,198 @@ void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, Publis static void publishing_rajce_value_arg_item_init (GValue* value) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9093 "RajcePublishing.c" +#line 9107 "RajcePublishing.c" } static void publishing_rajce_value_arg_item_free_value (GValue* value) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (value->data[0].v_pointer) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_unref (value->data[0].v_pointer); -#line 9102 "RajcePublishing.c" +#line 9116 "RajcePublishing.c" } } static void publishing_rajce_value_arg_item_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (src_value->data[0].v_pointer) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = publishing_rajce_arg_item_ref (src_value->data[0].v_pointer); -#line 9112 "RajcePublishing.c" +#line 9126 "RajcePublishing.c" } else { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 9116 "RajcePublishing.c" +#line 9130 "RajcePublishing.c" } } static gpointer publishing_rajce_value_arg_item_peek_pointer (const GValue* value) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9124 "RajcePublishing.c" +#line 9138 "RajcePublishing.c" } static gchar* publishing_rajce_value_arg_item_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (collect_values[0].v_pointer) { -#line 9131 "RajcePublishing.c" +#line 9145 "RajcePublishing.c" PublishingRajceArgItem* object; object = collect_values[0].v_pointer; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9138 "RajcePublishing.c" +#line 9152 "RajcePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 9142 "RajcePublishing.c" +#line 9156 "RajcePublishing.c" } -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = publishing_rajce_arg_item_ref (object); -#line 9146 "RajcePublishing.c" +#line 9160 "RajcePublishing.c" } else { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9150 "RajcePublishing.c" +#line 9164 "RajcePublishing.c" } -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9154 "RajcePublishing.c" +#line 9168 "RajcePublishing.c" } static gchar* publishing_rajce_value_arg_item_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PublishingRajceArgItem** object_p; object_p = collect_values[0].v_pointer; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!object_p) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9165 "RajcePublishing.c" +#line 9179 "RajcePublishing.c" } -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!value->data[0].v_pointer) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = NULL; -#line 9171 "RajcePublishing.c" +#line 9185 "RajcePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = value->data[0].v_pointer; -#line 9175 "RajcePublishing.c" +#line 9189 "RajcePublishing.c" } else { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = publishing_rajce_arg_item_ref (value->data[0].v_pointer); -#line 9179 "RajcePublishing.c" +#line 9193 "RajcePublishing.c" } -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9183 "RajcePublishing.c" +#line 9197 "RajcePublishing.c" } GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PublishingRajceParamSpecArgItem* spec; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return G_PARAM_SPEC (spec); -#line 9197 "RajcePublishing.c" +#line 9211 "RajcePublishing.c" } gpointer publishing_rajce_value_get_arg_item (const GValue* value) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9206 "RajcePublishing.c" +#line 9220 "RajcePublishing.c" } void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) { PublishingRajceArgItem* old; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM)); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" old = value->data[0].v_pointer; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (v_object) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_ARG_ITEM)); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_ref (value->data[0].v_pointer); -#line 9226 "RajcePublishing.c" +#line 9240 "RajcePublishing.c" } else { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9230 "RajcePublishing.c" +#line 9244 "RajcePublishing.c" } -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_unref (old); -#line 9236 "RajcePublishing.c" +#line 9250 "RajcePublishing.c" } } void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) { PublishingRajceArgItem* old; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM)); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" old = value->data[0].v_pointer; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (v_object) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_ARG_ITEM)); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 9255 "RajcePublishing.c" +#line 9269 "RajcePublishing.c" } else { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9259 "RajcePublishing.c" +#line 9273 "RajcePublishing.c" } -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_unref (old); -#line 9265 "RajcePublishing.c" +#line 9279 "RajcePublishing.c" } } static void publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass * klass) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_arg_item_parent_class = g_type_class_peek_parent (klass); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRajceArgItemClass *) klass)->finalize = publishing_rajce_arg_item_finalize; -#line 9275 "RajcePublishing.c" +#line 9289 "RajcePublishing.c" } static void publishing_rajce_arg_item_instance_init (PublishingRajceArgItem * self) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->ref_count = 1; -#line 9282 "RajcePublishing.c" +#line 9296 "RajcePublishing.c" } @@ -9290,52 +9304,52 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) { PublishingRajceArgItem * self; PublishingRajceArgItem** _tmp0_ = NULL; gint _tmp0__length1 = 0; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ARG_ITEM, PublishingRajceArgItem); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_handlers_destroy (self); -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->children; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0__length1 = self->children_length1; -#line 9298 "RajcePublishing.c" +#line 9312 "RajcePublishing.c" { PublishingRajceArgItem** child_collection = NULL; gint child_collection_length1 = 0; gint _child_collection_size_ = 0; gint child_it = 0; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child_collection = _tmp0_; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child_collection_length1 = _tmp0__length1; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) { -#line 9310 "RajcePublishing.c" +#line 9324 "RajcePublishing.c" PublishingRajceArgItem* _tmp1_ = NULL; PublishingRajceArgItem* child = NULL; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]); -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child = _tmp1_; -#line 9317 "RajcePublishing.c" +#line 9331 "RajcePublishing.c" { -#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); -#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child = NULL; -#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); -#line 9325 "RajcePublishing.c" +#line 9339 "RajcePublishing.c" } } } -#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->key); #line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (self->val); + _g_free0 (self->key); #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (self->val); +#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); -#line 9335 "RajcePublishing.c" +#line 9349 "RajcePublishing.c" } @@ -9356,24 +9370,24 @@ GType publishing_rajce_arg_item_get_type (void) { gpointer publishing_rajce_arg_item_ref (gpointer instance) { PublishingRajceArgItem* self; self = instance; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return instance; -#line 9360 "RajcePublishing.c" +#line 9374 "RajcePublishing.c" } void publishing_rajce_arg_item_unref (gpointer instance) { PublishingRajceArgItem* self; self = instance; -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_RAJCE_ARG_ITEM_GET_CLASS (self)->finalize (self); -#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 9373 "RajcePublishing.c" +#line 9387 "RajcePublishing.c" } } @@ -9383,55 +9397,55 @@ PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GTyp PublishingRajceArgItem** _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (cmd != NULL, NULL); -#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajceLiveApiRequest*) g_type_create_instance (object_type); -#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = g_new0 (PublishingRajceArgItem*, 0 + 1); -#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); -#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->_params = _tmp0_; -#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->_params_length1 = 0; -#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->__params_size_ = self->priv->_params_length1; #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->__params_size_ = self->priv->_params_length1; +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = cmd; -#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->_cmd); -#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->_cmd = _tmp2_; -#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 9407 "RajcePublishing.c" +#line 9421 "RajcePublishing.c" } PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd) { -#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_live_api_request_construct (PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, cmd); -#line 9414 "RajcePublishing.c" +#line 9428 "RajcePublishing.c" } static void _vala_array_add7 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 9425 "RajcePublishing.c" +#line 9439 "RajcePublishing.c" } -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 9431 "RajcePublishing.c" +#line 9445 "RajcePublishing.c" } @@ -9441,25 +9455,25 @@ void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest* const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; PublishingRajceArgItem* _tmp3_ = NULL; -#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); -#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (name != NULL); -#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (val != NULL); -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = self->priv->_params; -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0__length1 = self->priv->_params_length1; -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = name; -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = val; -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = publishing_rajce_arg_item_new (_tmp1_, _tmp2_); -#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _vala_array_add7 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp3_); -#line 9459 "RajcePublishing.c" +#line 9473 "RajcePublishing.c" } @@ -9467,27 +9481,27 @@ void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiReque const gchar* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; const gchar* _tmp2_ = NULL; -#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); -#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (name != NULL); -#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = val; -#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp1_) { -#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = "1"; -#line 9477 "RajcePublishing.c" +#line 9491 "RajcePublishing.c" } else { -#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = "0"; -#line 9481 "RajcePublishing.c" +#line 9495 "RajcePublishing.c" } -#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = name; -#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (self, _tmp2_, _tmp0_); -#line 9487 "RajcePublishing.c" +#line 9501 "RajcePublishing.c" } @@ -9496,40 +9510,40 @@ void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiReques gint _tmp1_ = 0; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); -#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (name != NULL); -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = name; -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = val; -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = g_strdup_printf ("%i", _tmp1_); -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = _tmp2_; -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (self, _tmp0_, _tmp3_); -#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp3_); -#line 9512 "RajcePublishing.c" +#line 9526 "RajcePublishing.c" } static void _vala_array_add8 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 9523 "RajcePublishing.c" +#line 9537 "RajcePublishing.c" } -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 9529 "RajcePublishing.c" +#line 9543 "RajcePublishing.c" } @@ -9542,33 +9556,33 @@ void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiReque PublishingRajceArgItem** _tmp3_ = NULL; gint _tmp3__length1 = 0; PublishingRajceArgItem* _tmp4_ = NULL; -#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self)); -#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (name != NULL); -#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = name; -#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = publishing_rajce_arg_item_new (_tmp0_, NULL); -#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - newItem = _tmp1_; #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + newItem = _tmp1_; +#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = val; -#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2__length1 = val_length1; -#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_arg_item_AddChildren (newItem, _tmp2_, _tmp2__length1); #line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_arg_item_AddChildren (newItem, _tmp2_, _tmp2__length1); +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = self->priv->_params; -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3__length1 = self->priv->_params_length1; -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = _publishing_rajce_arg_item_ref0 (newItem); -#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp4_); -#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (newItem); -#line 9568 "RajcePublishing.c" +#line 9582 "RajcePublishing.c" } @@ -9592,109 +9606,109 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp gchar* _tmp13_ = NULL; xmlDoc* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self), NULL); -#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = xmlNewDoc ((xmlChar*) "1.0"); -#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - doc = _tmp0_; #line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + doc = _tmp0_; +#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = xmlNewNode (NULL, (xmlChar*) "request"); -#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - root = _tmp1_; #line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + root = _tmp1_; +#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = doc; -#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = root; -#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xmlDocSetRootElement (_tmp2_, _tmp3_); #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xmlDocSetRootElement (_tmp2_, _tmp3_); +#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = root; -#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = self->priv->_cmd; -#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xmlNewTextChild (_tmp4_, NULL, (xmlChar*) "command", (xmlChar*) _tmp5_); #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xmlNewTextChild (_tmp4_, NULL, (xmlChar*) "command", (xmlChar*) _tmp5_); +#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = root; -#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = xmlNewTextChild (_tmp6_, NULL, (xmlChar*) "parameters", (xmlChar*) ""); -#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - par = _tmp7_; #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + par = _tmp7_; +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = self->priv->_params; -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8__length1 = self->priv->_params_length1; -#line 9624 "RajcePublishing.c" +#line 9638 "RajcePublishing.c" { PublishingRajceArgItem** arg_collection = NULL; gint arg_collection_length1 = 0; gint _arg_collection_size_ = 0; gint arg_it = 0; -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" arg_collection = _tmp8_; -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" arg_collection_length1 = _tmp8__length1; -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (arg_it = 0; arg_it < _tmp8__length1; arg_it = arg_it + 1) { -#line 9636 "RajcePublishing.c" +#line 9650 "RajcePublishing.c" PublishingRajceArgItem* _tmp9_ = NULL; PublishingRajceArgItem* arg = NULL; -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = _publishing_rajce_arg_item_ref0 (arg_collection[arg_it]); -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" arg = _tmp9_; -#line 9643 "RajcePublishing.c" +#line 9657 "RajcePublishing.c" { xmlNode* _tmp10_ = NULL; PublishingRajceArgItem* _tmp11_ = NULL; -#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = par; -#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = arg; -#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_WriteParam (_tmp10_, _tmp11_); -#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (arg); -#line 9655 "RajcePublishing.c" +#line 9669 "RajcePublishing.c" } } } -#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = doc; -#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" xmlDocDumpMemoryEnc (_tmp12_, (xmlChar**) (&_tmp13_), NULL, "UTF-8"); -#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xmlstr); -#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xmlstr = _tmp13_; #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xmlstr = _tmp13_; +#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = doc; -#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xmlFreeDoc (_tmp14_); #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xmlFreeDoc (_tmp14_); +#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = urlencode; -#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp15_) { -#line 9675 "RajcePublishing.c" +#line 9689 "RajcePublishing.c" const gchar* _tmp16_ = NULL; gchar* _tmp17_ = NULL; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = xmlstr; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = soup_uri_encode (_tmp16_, "&;"); -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp17_; -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xmlstr); -#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 9688 "RajcePublishing.c" +#line 9702 "RajcePublishing.c" } -#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = xmlstr; -#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 9694 "RajcePublishing.c" +#line 9708 "RajcePublishing.c" } @@ -9702,35 +9716,35 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish PublishingRajceArgItem* _tmp0_ = NULL; PublishingRajceArgItem** _tmp1_ = NULL; gint _tmp1__length1 = 0; -#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (arg)); -#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = arg; -#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = _tmp0_->children; -#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1__length1 = _tmp0_->children_length1; -#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp1__length1 == 0) { -#line 9712 "RajcePublishing.c" +#line 9726 "RajcePublishing.c" xmlNode* _tmp2_ = NULL; PublishingRajceArgItem* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; PublishingRajceArgItem* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = node; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = arg; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = _tmp3_->key; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = arg; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = _tmp5_->val; -#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" xmlNewTextChild (_tmp2_, NULL, (xmlChar*) _tmp4_, (xmlChar*) _tmp6_); -#line 9730 "RajcePublishing.c" +#line 9744 "RajcePublishing.c" } else { xmlNode* subnode = NULL; xmlNode* _tmp7_ = NULL; @@ -9740,54 +9754,54 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish PublishingRajceArgItem* _tmp11_ = NULL; PublishingRajceArgItem** _tmp12_ = NULL; gint _tmp12__length1 = 0; -#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = node; -#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = arg; -#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = _tmp8_->key; -#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = xmlNewTextChild (_tmp7_, NULL, (xmlChar*) _tmp9_, (xmlChar*) ""); -#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - subnode = _tmp10_; #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + subnode = _tmp10_; +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = arg; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = _tmp11_->children; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12__length1 = _tmp11_->children_length1; -#line 9756 "RajcePublishing.c" +#line 9770 "RajcePublishing.c" { PublishingRajceArgItem** child_collection = NULL; gint child_collection_length1 = 0; gint _child_collection_size_ = 0; gint child_it = 0; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child_collection = _tmp12_; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child_collection_length1 = _tmp12__length1; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" for (child_it = 0; child_it < _tmp12__length1; child_it = child_it + 1) { -#line 9768 "RajcePublishing.c" +#line 9782 "RajcePublishing.c" PublishingRajceArgItem* _tmp13_ = NULL; PublishingRajceArgItem* child = NULL; -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]); -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" child = _tmp13_; -#line 9775 "RajcePublishing.c" +#line 9789 "RajcePublishing.c" { xmlNode* _tmp14_ = NULL; PublishingRajceArgItem* _tmp15_ = NULL; -#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = subnode; -#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = child; -#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_WriteParam (_tmp14_, _tmp15_); -#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_arg_item_unref0 (child); -#line 9787 "RajcePublishing.c" +#line 9801 "RajcePublishing.c" } } } @@ -9796,216 +9810,216 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish static void publishing_rajce_value_live_api_request_init (GValue* value) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9798 "RajcePublishing.c" +#line 9812 "RajcePublishing.c" } static void publishing_rajce_value_live_api_request_free_value (GValue* value) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (value->data[0].v_pointer) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_unref (value->data[0].v_pointer); -#line 9807 "RajcePublishing.c" +#line 9821 "RajcePublishing.c" } } static void publishing_rajce_value_live_api_request_copy_value (const GValue* src_value, GValue* dest_value) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (src_value->data[0].v_pointer) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = publishing_rajce_live_api_request_ref (src_value->data[0].v_pointer); -#line 9817 "RajcePublishing.c" +#line 9831 "RajcePublishing.c" } else { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 9821 "RajcePublishing.c" +#line 9835 "RajcePublishing.c" } } static gpointer publishing_rajce_value_live_api_request_peek_pointer (const GValue* value) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9829 "RajcePublishing.c" +#line 9843 "RajcePublishing.c" } static gchar* publishing_rajce_value_live_api_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (collect_values[0].v_pointer) { -#line 9836 "RajcePublishing.c" +#line 9850 "RajcePublishing.c" PublishingRajceLiveApiRequest* object; object = collect_values[0].v_pointer; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (object->parent_instance.g_class == NULL) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 9843 "RajcePublishing.c" +#line 9857 "RajcePublishing.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 9847 "RajcePublishing.c" +#line 9861 "RajcePublishing.c" } -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = publishing_rajce_live_api_request_ref (object); -#line 9851 "RajcePublishing.c" +#line 9865 "RajcePublishing.c" } else { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9855 "RajcePublishing.c" +#line 9869 "RajcePublishing.c" } -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9859 "RajcePublishing.c" +#line 9873 "RajcePublishing.c" } static gchar* publishing_rajce_value_live_api_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { PublishingRajceLiveApiRequest** object_p; object_p = collect_values[0].v_pointer; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!object_p) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 9870 "RajcePublishing.c" +#line 9884 "RajcePublishing.c" } -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (!value->data[0].v_pointer) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = NULL; -#line 9876 "RajcePublishing.c" +#line 9890 "RajcePublishing.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = value->data[0].v_pointer; -#line 9880 "RajcePublishing.c" +#line 9894 "RajcePublishing.c" } else { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *object_p = publishing_rajce_live_api_request_ref (value->data[0].v_pointer); -#line 9884 "RajcePublishing.c" +#line 9898 "RajcePublishing.c" } -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 9888 "RajcePublishing.c" +#line 9902 "RajcePublishing.c" } GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { PublishingRajceParamSpecLiveApiRequest* spec; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return G_PARAM_SPEC (spec); -#line 9902 "RajcePublishing.c" +#line 9916 "RajcePublishing.c" } gpointer publishing_rajce_value_get_live_api_request (const GValue* value) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return value->data[0].v_pointer; -#line 9911 "RajcePublishing.c" +#line 9925 "RajcePublishing.c" } void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object) { PublishingRajceLiveApiRequest* old; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST)); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" old = value->data[0].v_pointer; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (v_object) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST)); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_ref (value->data[0].v_pointer); -#line 9931 "RajcePublishing.c" +#line 9945 "RajcePublishing.c" } else { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9935 "RajcePublishing.c" +#line 9949 "RajcePublishing.c" } -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_unref (old); -#line 9941 "RajcePublishing.c" +#line 9955 "RajcePublishing.c" } } void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object) { PublishingRajceLiveApiRequest* old; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST)); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" old = value->data[0].v_pointer; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (v_object) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST)); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = v_object; -#line 9960 "RajcePublishing.c" +#line 9974 "RajcePublishing.c" } else { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" value->data[0].v_pointer = NULL; -#line 9964 "RajcePublishing.c" +#line 9978 "RajcePublishing.c" } -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (old) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_unref (old); -#line 9970 "RajcePublishing.c" +#line 9984 "RajcePublishing.c" } } static void publishing_rajce_live_api_request_class_init (PublishingRajceLiveApiRequestClass * klass) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_parent_class = g_type_class_peek_parent (klass); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRajceLiveApiRequestClass *) klass)->finalize = publishing_rajce_live_api_request_finalize; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceLiveApiRequestPrivate)); -#line 9982 "RajcePublishing.c" +#line 9996 "RajcePublishing.c" } static void publishing_rajce_live_api_request_instance_init (PublishingRajceLiveApiRequest * self) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv = PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_PRIVATE (self); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->ref_count = 1; -#line 9991 "RajcePublishing.c" +#line 10005 "RajcePublishing.c" } static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest* obj) { PublishingRajceLiveApiRequest * self; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, PublishingRajceLiveApiRequest); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_signal_handlers_destroy (self); -#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); +#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (self->priv->_cmd); -#line 10005 "RajcePublishing.c" +#line 10019 "RajcePublishing.c" } @@ -10026,24 +10040,24 @@ GType publishing_rajce_live_api_request_get_type (void) { gpointer publishing_rajce_live_api_request_ref (gpointer instance) { PublishingRajceLiveApiRequest* self; self = instance; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_atomic_int_inc (&self->ref_count); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return instance; -#line 10030 "RajcePublishing.c" +#line 10044 "RajcePublishing.c" } void publishing_rajce_live_api_request_unref (gpointer instance) { PublishingRajceLiveApiRequest* self; self = instance; -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_CLASS (self)->finalize (self); -#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_free_instance ((GTypeInstance *) self); -#line 10043 "RajcePublishing.c" +#line 10057 "RajcePublishing.c" } } @@ -10051,22 +10065,22 @@ void publishing_rajce_live_api_request_unref (gpointer instance) { PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session) { PublishingRajceTransaction* self = NULL; PublishingRajceSession* _tmp0_ = NULL; -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = (PublishingRajceTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10059 "RajcePublishing.c" +#line 10073 "RajcePublishing.c" } PublishingRajceTransaction* publishing_rajce_transaction_new (PublishingRajceSession* session) { -#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_transaction_construct (PUBLISHING_RAJCE_TYPE_TRANSACTION, session); -#line 10066 "RajcePublishing.c" +#line 10080 "RajcePublishing.c" } @@ -10094,64 +10108,64 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; GError * _inner_error_ = NULL; -#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL); -#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = doc; -#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_); -#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - root = _tmp1_; #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + root = _tmp1_; +#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = root; -#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp2_ == NULL) { -#line 10106 "RajcePublishing.c" +#line 10120 "RajcePublishing.c" gchar* _tmp3_ = NULL; -#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = g_strdup ("No XML returned from server"); -#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp3_; -#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10114 "RajcePublishing.c" +#line 10128 "RajcePublishing.c" } -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = root; -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _tmp4_->name; -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = g_strdup (_tmp5_); -#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" name = _tmp6_; -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = name; -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp8_ == NULL) { -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = TRUE; -#line 10130 "RajcePublishing.c" +#line 10144 "RajcePublishing.c" } else { const gchar* _tmp9_ = NULL; -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = name; -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = g_strcmp0 (_tmp9_, "response") != 0; -#line 10137 "RajcePublishing.c" +#line 10151 "RajcePublishing.c" } -#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp7_) { -#line 10141 "RajcePublishing.c" +#line 10155 "RajcePublishing.c" gchar* _tmp10_ = NULL; -#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = g_strdup ("No response from Rajce in XML"); -#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp10_; -#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (name); -#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10151 "RajcePublishing.c" +#line 10165 "RajcePublishing.c" } { xmlNode* _tmp11_ = NULL; @@ -10162,129 +10176,129 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume PublishingRESTSupportXmlDocument* _tmp16_ = NULL; xmlNode* _tmp17_ = NULL; xmlNode* _tmp18_ = NULL; -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = doc; -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = root; -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "errorCode", &_inner_error_); -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = _tmp14_; -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 10174 "RajcePublishing.c" +#line 10188 "RajcePublishing.c" goto __catch31_spit_publishing_publishing_error; } -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (name); -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_clear_error (&_inner_error_); -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 10185 "RajcePublishing.c" +#line 10199 "RajcePublishing.c" } -#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - errcode = _tmp11_; #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + errcode = _tmp11_; +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = doc; -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = root; -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "result", &_inner_error_); -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = _tmp18_; -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 10201 "RajcePublishing.c" +#line 10215 "RajcePublishing.c" goto __catch31_spit_publishing_publishing_error; } -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (name); -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_clear_error (&_inner_error_); -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 10212 "RajcePublishing.c" +#line 10226 "RajcePublishing.c" } -#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _result_ = _tmp15_; -#line 10216 "RajcePublishing.c" +#line 10230 "RajcePublishing.c" } goto __finally31; __catch31_spit_publishing_publishing_error: { GError* err = NULL; -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" err = _inner_error_; -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _inner_error_ = NULL; -#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = NULL; -#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_error_free0 (err); -#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (name); -#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10234 "RajcePublishing.c" +#line 10248 "RajcePublishing.c" } __finally31: -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (name); -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_clear_error (&_inner_error_); -#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return NULL; -#line 10247 "RajcePublishing.c" +#line 10261 "RajcePublishing.c" } -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp19_ = errcode; -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp20_ = (gchar*) xmlNodeGetContent (_tmp19_); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp21_ = _tmp20_; -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp22_ = atoi (_tmp21_); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = _result_; -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp25_ = _tmp24_; -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = g_strdup_printf ("999 Rajce Error [%d]: %s", _tmp22_, _tmp25_); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp27_ = _tmp26_; -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp25_); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp21_); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" result = _tmp27_; -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (name); -#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return result; -#line 10277 "RajcePublishing.c" +#line 10291 "RajcePublishing.c" } static void publishing_rajce_transaction_class_init (PublishingRajceTransactionClass * klass) { -#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10284 "RajcePublishing.c" +#line 10298 "RajcePublishing.c" } @@ -10321,67 +10335,67 @@ PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transacti const gchar* _tmp5_ = NULL; gchar* xml = NULL; gchar* _tmp6_ = NULL; -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (username != NULL, NULL); -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (token != NULL, NULL); -#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = url; -#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_debug ("RajcePublishing.vala:1396: SessionLoginTransaction: URL: %s", _tmp0_); #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_debug ("RajcePublishing.vala:1397: SessionLoginTransaction: URL: %s", _tmp0_); +#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = session; -#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = url; -#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); +#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = publishing_rajce_live_api_request_new ("login"); -#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp3_; #line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (req, "clientID", "RajceShotwellPlugin"); + req = _tmp3_; #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (req, "currentVersion", "1.1.1.1"); + publishing_rajce_live_api_request_AddParam (req, "clientID", "RajceShotwellPlugin"); #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParam (req, "currentVersion", "1.1.1.1"); +#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = username; -#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (req, "login", _tmp4_); #line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParam (req, "login", _tmp4_); +#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = token; -#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (req, "password", _tmp5_); #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParam (req, "password", _tmp5_); +#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE); -#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp6_; #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp6_; +#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10367 "RajcePublishing.c" +#line 10381 "RajcePublishing.c" } PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) { -#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_session_login_transaction_construct (PUBLISHING_RAJCE_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, token); -#line 10374 "RajcePublishing.c" +#line 10388 "RajcePublishing.c" } static void publishing_rajce_session_login_transaction_class_init (PublishingRajceSessionLoginTransactionClass * klass) { -#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_session_login_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10381 "RajcePublishing.c" +#line 10395 "RajcePublishing.c" } @@ -10405,87 +10419,87 @@ GType publishing_rajce_session_login_transaction_get_type (void) { static void _vala_array_add9 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - if ((*length) == (*size)) { -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10411 "RajcePublishing.c" - } -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*array)[(*length)++] = value; -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - (*array)[*length] = NULL; -#line 10417 "RajcePublishing.c" -} - - -static void _vala_array_add10 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10428 "RajcePublishing.c" +#line 10425 "RajcePublishing.c" } #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10434 "RajcePublishing.c" +#line 10431 "RajcePublishing.c" } -static void _vala_array_add11 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add10 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10445 "RajcePublishing.c" +#line 10442 "RajcePublishing.c" } #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10451 "RajcePublishing.c" +#line 10448 "RajcePublishing.c" } -static void _vala_array_add12 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add11 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10462 "RajcePublishing.c" +#line 10459 "RajcePublishing.c" } #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10468 "RajcePublishing.c" +#line 10465 "RajcePublishing.c" } -static void _vala_array_add13 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +static void _vala_array_add12 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*length) == (*size)) { #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *size = (*size) ? (2 * (*size)) : 4; #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); -#line 10479 "RajcePublishing.c" +#line 10476 "RajcePublishing.c" } #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[(*length)++] = value; #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" (*array)[*length] = NULL; -#line 10485 "RajcePublishing.c" +#line 10482 "RajcePublishing.c" +} + + +static void _vala_array_add13 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) { +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + if ((*length) == (*size)) { +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + *size = (*size) ? (2 * (*size)) : 4; +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + *array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1); +#line 10493 "RajcePublishing.c" + } +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + (*array)[(*length)++] = value; +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + (*array)[*length] = NULL; +#line 10499 "RajcePublishing.c" } @@ -10521,113 +10535,113 @@ PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_con gint _tmp17__length1 = 0; gchar* xml = NULL; gchar* _tmp18_ = NULL; -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = url; -#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceGetAlbumsTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceGetAlbumsTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); +#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = publishing_rajce_live_api_request_new ("getAlbumList"); -#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp2_; #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + req = _tmp2_; +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = session; -#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_); -#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _tmp4_; -#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_); -#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp5_); #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp5_); +#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = g_new0 (PublishingRajceArgItem*, 0 + 1); -#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" columns = _tmp6_; -#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" columns_length1 = 0; -#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _columns_size_ = columns_length1; #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _columns_size_ = columns_length1; +#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = columns; -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7__length1 = columns_length1; -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = publishing_rajce_arg_item_new ("column", "viewCount"); -#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp8_); #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp8_); +#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = columns; -#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9__length1 = columns_length1; -#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = publishing_rajce_arg_item_new ("column", "isFavourite"); -#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp10_); #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp10_); +#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = columns; -#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11__length1 = columns_length1; -#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = publishing_rajce_arg_item_new ("column", "descriptionHtml"); -#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp12_); #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp12_); +#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = columns; -#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13__length1 = columns_length1; -#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = publishing_rajce_arg_item_new ("column", "coverPhotoID"); -#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp14_); #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp14_); +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = columns; -#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15__length1 = columns_length1; -#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = publishing_rajce_arg_item_new ("column", "localPath"); -#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp16_); #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp16_); +#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = columns; -#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17__length1 = columns_length1; -#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp17_, _tmp17__length1); #line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp17_, _tmp17__length1); +#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE); -#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp18_; #line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp18_; +#line 1427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL); -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10613 "RajcePublishing.c" +#line 10627 "RajcePublishing.c" } PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session, const gchar* url) { -#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_get_albums_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUMS_TRANSACTION, session, url); -#line 10620 "RajcePublishing.c" +#line 10634 "RajcePublishing.c" } static void publishing_rajce_get_albums_transaction_class_init (PublishingRajceGetAlbumsTransactionClass * klass) { -#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_get_albums_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10627 "RajcePublishing.c" +#line 10641 "RajcePublishing.c" } @@ -10663,69 +10677,69 @@ PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction gboolean _tmp7_ = FALSE; gchar* xml = NULL; gchar* _tmp8_ = NULL; -#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (albumName != NULL, NULL); -#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = url; -#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceCreateAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceCreateAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); +#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = publishing_rajce_live_api_request_new ("createAlbum"); -#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp2_; #line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + req = _tmp2_; +#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = session; -#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_); -#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _tmp4_; -#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_); -#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp5_); #line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp5_); +#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = albumName; -#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (req, "albumName", _tmp6_); #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (req, "albumDescription", ""); + publishing_rajce_live_api_request_AddParam (req, "albumName", _tmp6_); #line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParam (req, "albumDescription", ""); +#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = hidden; -#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !_tmp7_); #line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !_tmp7_); +#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE); -#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp8_; #line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp8_; +#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10711 "RajcePublishing.c" +#line 10725 "RajcePublishing.c" } PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) { -#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_create_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CREATE_ALBUM_TRANSACTION, session, url, albumName, hidden); -#line 10718 "RajcePublishing.c" +#line 10732 "RajcePublishing.c" } static void publishing_rajce_create_album_transaction_class_init (PublishingRajceCreateAlbumTransactionClass * klass) { -#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_create_album_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10725 "RajcePublishing.c" +#line 10739 "RajcePublishing.c" } @@ -10760,61 +10774,61 @@ PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_con gint _tmp6_ = 0; gchar* xml = NULL; gchar* _tmp7_ = NULL; -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = url; -#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceOpenAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceOpenAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); +#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = publishing_rajce_live_api_request_new ("openAlbum"); -#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp2_; #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + req = _tmp2_; +#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = session; -#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_); -#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _tmp4_; -#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_); -#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp5_); #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp5_); +#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = albumID; -#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParamInt (req, "albumID", _tmp6_); #line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParamInt (req, "albumID", _tmp6_); +#line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE); -#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp7_; #line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp7_; +#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10800 "RajcePublishing.c" +#line 10814 "RajcePublishing.c" } PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session, const gchar* url, gint albumID) { -#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_open_album_transaction_construct (PUBLISHING_RAJCE_TYPE_OPEN_ALBUM_TRANSACTION, session, url, albumID); -#line 10807 "RajcePublishing.c" +#line 10821 "RajcePublishing.c" } static void publishing_rajce_open_album_transaction_class_init (PublishingRajceOpenAlbumTransactionClass * klass) { -#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_open_album_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10814 "RajcePublishing.c" +#line 10828 "RajcePublishing.c" } @@ -10851,67 +10865,67 @@ PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transactio gchar* _tmp8_ = NULL; gchar* xml = NULL; gchar* _tmp9_ = NULL; -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = url; -#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceGetAlbumUrlTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceGetAlbumUrlTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); +#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = publishing_rajce_live_api_request_new ("getAlbumUrl"); -#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp2_; #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + req = _tmp2_; +#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = session; -#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_); -#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _tmp4_; -#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_); -#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp5_); #line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp5_); +#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = session; -#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_); -#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = _tmp7_; -#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_); -#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp8_); #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp8_); +#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE); -#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp9_; #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp9_; +#line 1477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10897 "RajcePublishing.c" +#line 10911 "RajcePublishing.c" } PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session, const gchar* url) { -#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_get_album_url_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUM_URL_TRANSACTION, session, url); -#line 10904 "RajcePublishing.c" +#line 10918 "RajcePublishing.c" } static void publishing_rajce_get_album_url_transaction_class_init (PublishingRajceGetAlbumUrlTransactionClass * klass) { -#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_get_album_url_transaction_parent_class = g_type_class_peek_parent (klass); -#line 10911 "RajcePublishing.c" +#line 10925 "RajcePublishing.c" } @@ -10948,67 +10962,67 @@ PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_c gchar* _tmp8_ = NULL; gchar* xml = NULL; gchar* _tmp9_ = NULL; -#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = url; -#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceCloseAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceCloseAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); +#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = publishing_rajce_live_api_request_new ("closeAlbum"); -#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp2_; #line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + req = _tmp2_; +#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = session; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_); -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _tmp4_; -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_); -#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp5_); #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp5_); +#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = session; -#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_); -#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = _tmp7_; -#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_); -#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp8_); #line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp8_); +#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE); -#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp9_; #line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp9_; +#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 10994 "RajcePublishing.c" +#line 11008 "RajcePublishing.c" } PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session, const gchar* url) { -#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_close_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CLOSE_ALBUM_TRANSACTION, session, url); -#line 11001 "RajcePublishing.c" +#line 11015 "RajcePublishing.c" } static void publishing_rajce_close_album_transaction_class_init (PublishingRajceCloseAlbumTransactionClass * klass) { -#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_close_album_transaction_parent_class = g_type_class_peek_parent (klass); -#line 11008 "RajcePublishing.c" +#line 11022 "RajcePublishing.c" } @@ -11042,57 +11056,57 @@ PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transac gchar* _tmp5_ = NULL; gchar* xml = NULL; gchar* _tmp6_ = NULL; -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = url; -#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceGetCategoriesTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceGetCategoriesTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); +#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = publishing_rajce_live_api_request_new ("getCategories"); -#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp2_; #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + req = _tmp2_; +#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = session; -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_); -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = _tmp4_; -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_); -#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp5_); #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp5_); +#line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE); -#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp6_; #line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp6_; +#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 11078 "RajcePublishing.c" +#line 11092 "RajcePublishing.c" } PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session, const gchar* url) { -#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_get_categories_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_CATEGORIES_TRANSACTION, session, url); -#line 11085 "RajcePublishing.c" +#line 11099 "RajcePublishing.c" } static void publishing_rajce_get_categories_transaction_class_init (PublishingRajceGetCategoriesTransactionClass * klass) { -#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_get_categories_transaction_parent_class = g_type_class_peek_parent (klass); -#line 11092 "RajcePublishing.c" +#line 11106 "RajcePublishing.c" } @@ -11116,9 +11130,9 @@ GType publishing_rajce_get_categories_transaction_get_type (void) { static void _g_free0_ (gpointer var) { -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" var = (g_free (var), NULL); -#line 11118 "RajcePublishing.c" +#line 11132 "RajcePublishing.c" } @@ -11187,253 +11201,253 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const gchar* _tmp53_ = NULL; const gchar* _tmp54_ = NULL; gchar* _tmp55_ = NULL; -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (url != NULL, NULL); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters), NULL); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp0_ = session; -#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp1_ = publishable; -#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp2_ = url; -#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_); #line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_); +#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp3_ = parameters; -#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp4_ = _publishing_rajce_publishing_parameters_ref0 (_tmp3_); -#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_publishing_parameters_unref0 (self->priv->parameters); -#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->parameters = _tmp4_; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp6_ = parameters; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp7_ = _tmp6_->album_id; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if ((*_tmp7_) > 0) { -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = ""; -#line 11219 "RajcePublishing.c" +#line 11233 "RajcePublishing.c" } else { -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp5_ = " new"; -#line 11223 "RajcePublishing.c" +#line 11237 "RajcePublishing.c" } -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp8_ = publishable; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp9_ = spit_publishing_publishable_get_serialized_file (_tmp8_); -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp10_ = _tmp9_; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp11_ = g_file_get_basename (_tmp10_); -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp12_ = _tmp11_; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp13_ = parameters; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp14_ = _tmp13_->album_name; -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_debug ("RajcePublishing.vala:1523: RajcePlugin: Uploading photo %s to%s album " \ +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_debug ("RajcePublishing.vala:1524: RajcePlugin: Uploading photo %s to%s album " \ "%s", _tmp12_, _tmp5_, _tmp14_); -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (_tmp12_); -#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_object_unref0 (_tmp10_); -#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp15_ = publishable; -#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp16_ = spit_publishing_publishable_get_param_string (_tmp15_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME); -#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - basename = _tmp16_; #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + basename = _tmp16_; +#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp17_ = publishable; -#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp18_ = spit_publishing_publishable_get_param_string (_tmp17_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT); -#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - comment = _tmp18_; #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + comment = _tmp18_; +#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp19_ = publishable; -#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp20_ = spit_publishing_publishable_get_publishing_name (_tmp19_); -#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" pubname = _tmp20_; -#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp21_ = session; -#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp22_ = publishing_rajce_session_get_maxsize (_tmp21_); -#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - width = _tmp22_; #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + width = _tmp22_; +#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp23_ = session; -#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp24_ = publishing_rajce_session_get_maxsize (_tmp23_); -#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" height = _tmp24_; -#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp25_ = publishing_rajce_live_api_request_new ("addPhoto"); -#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - req = _tmp25_; #line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + req = _tmp25_; +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp26_ = req; -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp27_ = session; -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp28_ = publishing_rajce_session_get_usertoken (_tmp27_); -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp29_ = _tmp28_; -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (_tmp26_, "token", _tmp29_); -#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp29_); #line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp29_); +#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp30_ = req; -#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp31_ = width; -#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParamInt (_tmp30_, "width", _tmp31_); #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParamInt (_tmp30_, "width", _tmp31_); +#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp32_ = req; -#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp33_ = height; -#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParamInt (_tmp32_, "height", _tmp33_); #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParamInt (_tmp32_, "height", _tmp33_); +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp34_ = req; -#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp35_ = session; -#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp36_ = publishing_rajce_session_get_albumtoken (_tmp35_); -#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp37_ = _tmp36_; -#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_live_api_request_AddParam (_tmp34_, "albumToken", _tmp37_); -#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - _g_free0 (_tmp37_); #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + _g_free0 (_tmp37_); +#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp38_ = req; -#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp39_ = pubname; -#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (_tmp38_, "photoName", _tmp39_); #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParam (_tmp38_, "photoName", _tmp39_); +#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp40_ = req; -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp41_ = basename; -#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (_tmp40_, "fullFileName", _tmp41_); #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParam (_tmp40_, "fullFileName", _tmp41_); +#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp43_ = comment; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" if (_tmp43_ != NULL) { -#line 11331 "RajcePublishing.c" +#line 11345 "RajcePublishing.c" const gchar* _tmp44_ = NULL; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp44_ = comment; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp42_ = _tmp44_; -#line 11337 "RajcePublishing.c" +#line 11351 "RajcePublishing.c" } else { -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp42_ = ""; -#line 11341 "RajcePublishing.c" +#line 11355 "RajcePublishing.c" } -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp45_ = req; -#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - publishing_rajce_live_api_request_AddParam (_tmp45_, "description", _tmp42_); #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + publishing_rajce_live_api_request_AddParam (_tmp45_, "description", _tmp42_); +#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp46_ = req; -#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp47_ = publishing_rajce_live_api_request_Params2XmlString (_tmp46_, FALSE); -#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - xml = _tmp47_; #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + xml = _tmp47_; +#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml); -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp48_ = g_str_hash; -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp49_ = g_str_equal; -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp50_ = g_hash_table_new_full (_tmp48_, _tmp49_, _g_free0_, _g_free0_); -#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - disposition_table = _tmp50_; #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + disposition_table = _tmp50_; +#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp51_ = g_strdup ("name"); -#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp52_ = g_strdup ("photo"); -#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_hash_table_insert (disposition_table, _tmp51_, _tmp52_); #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_hash_table_insert (disposition_table, _tmp51_, _tmp52_); +#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp53_ = g_strdup ("filename"); -#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp54_ = basename; -#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _tmp55_ = soup_uri_encode (_tmp54_, NULL); -#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" - g_hash_table_insert (disposition_table, _tmp53_, _tmp55_); #line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" + g_hash_table_insert (disposition_table, _tmp53_, _tmp55_); +#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.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 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_hash_table_unref0 (disposition_table); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (xml); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_live_api_request_unref0 (req); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (pubname); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (comment); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _g_free0 (basename); -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return self; -#line 11393 "RajcePublishing.c" +#line 11407 "RajcePublishing.c" } PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) { -#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" return publishing_rajce_add_photo_transaction_construct (PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, session, url, parameters, publishable); -#line 11400 "RajcePublishing.c" +#line 11414 "RajcePublishing.c" } static void publishing_rajce_add_photo_transaction_class_init (PublishingRajceAddPhotoTransactionClass * klass) { -#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" publishing_rajce_add_photo_transaction_parent_class = g_type_class_peek_parent (klass); -#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rajce_add_photo_transaction_finalize; -#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" g_type_class_add_private (klass, sizeof (PublishingRajceAddPhotoTransactionPrivate)); -#line 11411 "RajcePublishing.c" +#line 11425 "RajcePublishing.c" } static void publishing_rajce_add_photo_transaction_instance_init (PublishingRajceAddPhotoTransaction * self) { -#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv = PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_GET_PRIVATE (self); -#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self->priv->parameters = NULL; -#line 11420 "RajcePublishing.c" +#line 11434 "RajcePublishing.c" } static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction* obj) { PublishingRajceAddPhotoTransaction * self; -#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, PublishingRajceAddPhotoTransaction); -#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" _publishing_rajce_publishing_parameters_unref0 (self->priv->parameters); -#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" +#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rajce_add_photo_transaction_parent_class)->finalize (obj); -#line 11432 "RajcePublishing.c" +#line 11446 "RajcePublishing.c" } diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.vala b/plugins/shotwell-publishing-extras/RajcePublishing.vala index b304f13..a088274 100644 --- a/plugins/shotwell-publishing-extras/RajcePublishing.vala +++ b/plugins/shotwell-publishing-extras/RajcePublishing.vala @@ -852,7 +852,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object builder.add_from_resource (Resources.RESOURCE_PATH + "/rajce_authentication_pane.ui"); builder.connect_signals(null); - Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment; + var content = builder.get_object ("content") as Gtk.Box; Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label; switch (mode) { @@ -897,7 +897,8 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object username_entry.changed.connect(on_user_changed); password_entry.changed.connect(on_password_changed); login_button.clicked.connect(on_login_button_clicked); - align.reparent(pane_widget); + content.parent.remove (content); + pane_widget.add (content); publisher.get_host().set_dialog_default_widget(login_button); } catch (Error e) diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c index 18bf8ce..0127984 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.c +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c @@ -2364,11 +2364,11 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req gint _key_value_pairs_size_ = 0; gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; - gboolean _tmp24_ = FALSE; - const gchar* _tmp25_ = NULL; - PublishingTumblrTumblrPublisherSession* _tmp31_ = NULL; - const gchar* _tmp32_ = NULL; - const gchar* _tmp33_ = NULL; + gboolean _tmp25_ = FALSE; + const gchar* _tmp26_ = NULL; + PublishingTumblrTumblrPublisherSession* _tmp33_ = NULL; + const gchar* _tmp34_ = NULL; + const gchar* _tmp35_ = NULL; #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self)); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2425,9 +2425,9 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req gint _split_pair_size_ = 0; gchar** _tmp9_ = NULL; gint _tmp9__length1 = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - const gchar* _tmp15_ = NULL; + gchar** _tmp15_ = NULL; + gint _tmp15__length1 = 0; + const gchar* _tmp16_ = NULL; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = pair; #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2447,139 +2447,145 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req #line 2444 "TumblrPublishing.c" SpitPublishingPluginHost* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; - GError* _tmp12_ = NULL; + const gchar* _tmp12_ = NULL; GError* _tmp13_ = NULL; + GError* _tmp14_ = NULL; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = self->priv->host; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = _ ("“%s” isn’t a valid response to an OAuth authentication request"); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_); + _tmp12_ = response; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp13_ = _tmp12_; + _tmp13_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_, _tmp12_); +#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp14_ = _tmp13_; #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_); + spit_publishing_plugin_host_post_error (_tmp10_, _tmp14_); #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_error_free0 (_tmp13_); -#line 2461 "TumblrPublishing.c" + _g_error_free0 (_tmp14_); +#line 2464 "TumblrPublishing.c" } #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp14_ = split_pair; + _tmp15_ = split_pair; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp14__length1 = split_pair_length1; + _tmp15__length1 = split_pair_length1; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp15_ = _tmp14_[0]; + _tmp16_ = _tmp15_[0]; #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (g_strcmp0 (_tmp15_, "oauth_token") == 0) { -#line 2471 "TumblrPublishing.c" - gchar** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - const gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; + if (g_strcmp0 (_tmp16_, "oauth_token") == 0) { +#line 2474 "TumblrPublishing.c" + gchar** _tmp17_ = NULL; + gint _tmp17__length1 = 0; + const gchar* _tmp18_ = NULL; + gchar* _tmp19_ = NULL; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp16_ = split_pair; + _tmp17_ = split_pair; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp16__length1 = split_pair_length1; + _tmp17__length1 = split_pair_length1; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp17_ = _tmp16_[1]; + _tmp18_ = _tmp17_[1]; #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp18_ = g_strdup (_tmp17_); + _tmp19_ = g_strdup (_tmp18_); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token); #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - oauth_token = _tmp18_; -#line 2488 "TumblrPublishing.c" + oauth_token = _tmp19_; +#line 2491 "TumblrPublishing.c" } else { - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - const gchar* _tmp20_ = NULL; + gchar** _tmp20_ = NULL; + gint _tmp20__length1 = 0; + const gchar* _tmp21_ = NULL; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp19_ = split_pair; + _tmp20_ = split_pair; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp19__length1 = split_pair_length1; + _tmp20__length1 = split_pair_length1; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp20_ = _tmp19_[0]; + _tmp21_ = _tmp20_[0]; #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) { -#line 2501 "TumblrPublishing.c" - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - const gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + if (g_strcmp0 (_tmp21_, "oauth_token_secret") == 0) { +#line 2504 "TumblrPublishing.c" + gchar** _tmp22_ = NULL; + gint _tmp22__length1 = 0; + const gchar* _tmp23_ = NULL; + gchar* _tmp24_ = NULL; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp21_ = split_pair; + _tmp22_ = split_pair; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp21__length1 = split_pair_length1; + _tmp22__length1 = split_pair_length1; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp22_ = _tmp21_[1]; + _tmp23_ = _tmp22_[1]; #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp23_ = g_strdup (_tmp22_); + _tmp24_ = g_strdup (_tmp23_); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token_secret); #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - oauth_token_secret = _tmp23_; -#line 2518 "TumblrPublishing.c" + oauth_token_secret = _tmp24_; +#line 2521 "TumblrPublishing.c" } } #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL); #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (pair); -#line 2525 "TumblrPublishing.c" +#line 2528 "TumblrPublishing.c" } } } #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp25_ = oauth_token; + _tmp26_ = oauth_token; #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (_tmp25_ == NULL) { + if (_tmp26_ == NULL) { #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp24_ = TRUE; -#line 2535 "TumblrPublishing.c" + _tmp25_ = TRUE; +#line 2538 "TumblrPublishing.c" } else { - const gchar* _tmp26_ = NULL; + const gchar* _tmp27_ = NULL; #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp26_ = oauth_token_secret; + _tmp27_ = oauth_token_secret; #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp24_ = _tmp26_ == NULL; -#line 2542 "TumblrPublishing.c" + _tmp25_ = _tmp27_ == NULL; +#line 2545 "TumblrPublishing.c" } #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - if (_tmp24_) { -#line 2546 "TumblrPublishing.c" - SpitPublishingPluginHost* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; - GError* _tmp29_ = NULL; - GError* _tmp30_ = NULL; + if (_tmp25_) { +#line 2549 "TumblrPublishing.c" + SpitPublishingPluginHost* _tmp28_ = NULL; + const gchar* _tmp29_ = NULL; + const gchar* _tmp30_ = NULL; + GError* _tmp31_ = NULL; + GError* _tmp32_ = NULL; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp27_ = self->priv->host; + _tmp28_ = self->priv->host; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp28_ = _ ("“%s” isn’t a valid response to an OAuth authentication request"); + _tmp29_ = _ ("“%s” isn’t a valid response to an OAuth authentication request"); #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp29_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp28_); + _tmp30_ = response; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp30_ = _tmp29_; + _tmp31_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp29_, _tmp30_); #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_); + _tmp32_ = _tmp31_; #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_error_free0 (_tmp30_); -#line 2563 "TumblrPublishing.c" + spit_publishing_plugin_host_post_error (_tmp28_, _tmp32_); +#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_error_free0 (_tmp32_); +#line 2569 "TumblrPublishing.c" } #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp31_ = self->priv->session; + _tmp33_ = self->priv->session; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp32_ = oauth_token; + _tmp34_ = oauth_token; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp33_ = oauth_token_secret; + _tmp35_ = oauth_token_secret; #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp31_, _tmp32_, _tmp33_); + publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp33_, _tmp34_, _tmp35_); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token_secret); #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (oauth_token); -#line 2579 "TumblrPublishing.c" +#line 2585 "TumblrPublishing.c" } @@ -2599,7 +2605,7 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish if (!_tmp0_) { #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2599 "TumblrPublishing.c" +#line 2605 "TumblrPublishing.c" } #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:332: EVENT: a fully authenticated session has be" \ @@ -2626,21 +2632,21 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish _g_free0 (_tmp6_); #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_get_blogs (self); -#line 2625 "TumblrPublishing.c" +#line 2631 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) { #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender); -#line 2632 "TumblrPublishing.c" +#line 2638 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) { #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err); -#line 2639 "TumblrPublishing.c" +#line 2645 "TumblrPublishing.c" } @@ -2663,7 +2669,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0); #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0); -#line 2662 "TumblrPublishing.c" +#line 2668 "TumblrPublishing.c" { #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); @@ -2671,7 +2677,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum if (G_UNLIKELY (_inner_error_ != NULL)) { #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 2670 "TumblrPublishing.c" +#line 2676 "TumblrPublishing.c" goto __catch33_spit_publishing_publishing_error; } #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2682,7 +2688,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum g_clear_error (&_inner_error_); #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2681 "TumblrPublishing.c" +#line 2687 "TumblrPublishing.c" } } goto __finally33; @@ -2703,7 +2709,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (err); -#line 2702 "TumblrPublishing.c" +#line 2708 "TumblrPublishing.c" } __finally33: #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -2716,11 +2722,11 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum g_clear_error (&_inner_error_); #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2715 "TumblrPublishing.c" +#line 2721 "TumblrPublishing.c" } #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_transaction_unref0 (txn); -#line 2719 "TumblrPublishing.c" +#line 2725 "TumblrPublishing.c" } @@ -2758,7 +2764,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu if (!_tmp4_) { #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 2757 "TumblrPublishing.c" +#line 2763 "TumblrPublishing.c" } #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = txn; @@ -2783,14 +2789,14 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu _g_free0 (_tmp10_); #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self); -#line 2781 "TumblrPublishing.c" +#line 2787 "TumblrPublishing.c" } static gpointer _json_object_ref0 (gpointer self) { #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? json_object_ref (self) : NULL; -#line 2788 "TumblrPublishing.c" +#line 2794 "TumblrPublishing.c" } @@ -2803,7 +2809,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_return_val_if_fail (old != NULL, NULL); #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 2801 "TumblrPublishing.c" +#line 2807 "TumblrPublishing.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -2834,7 +2840,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2832 "TumblrPublishing.c" +#line 2838 "TumblrPublishing.c" goto __catch35_g_regex_error; } #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -2843,7 +2849,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 2841 "TumblrPublishing.c" +#line 2847 "TumblrPublishing.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp6_ = regex; @@ -2859,7 +2865,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2857 "TumblrPublishing.c" +#line 2863 "TumblrPublishing.c" goto __catch35_g_regex_error; } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -2870,7 +2876,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 2868 "TumblrPublishing.c" +#line 2874 "TumblrPublishing.c" } #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = _tmp5_; @@ -2884,7 +2890,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2882 "TumblrPublishing.c" +#line 2888 "TumblrPublishing.c" } goto __finally35; __catch35_g_regex_error: @@ -2898,7 +2904,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_assert_not_reached (); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2896 "TumblrPublishing.c" +#line 2902 "TumblrPublishing.c" } __finally35: #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -2909,7 +2915,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return NULL; -#line 2907 "TumblrPublishing.c" +#line 2913 "TumblrPublishing.c" } } @@ -2921,13 +2927,13 @@ static void _vala_array_add21 (PublishingTumblrBlogEntry*** array, int* length, *size = (*size) ? (2 * (*size)) : 4; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1); -#line 2919 "TumblrPublishing.c" +#line 2925 "TumblrPublishing.c" } #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 2925 "TumblrPublishing.c" +#line 2931 "TumblrPublishing.c" } @@ -2943,7 +2949,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:370: ACTION: parsing info request response '%s' " \ "into list of available blogs", _tmp0_); -#line 2940 "TumblrPublishing.c" +#line 2946 "TumblrPublishing.c" { JsonParser* parser = NULL; JsonParser* _tmp1_ = NULL; @@ -2975,7 +2981,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req if (G_UNLIKELY (_inner_error_ != NULL)) { #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (parser); -#line 2972 "TumblrPublishing.c" +#line 2978 "TumblrPublishing.c" goto __catch34_g_error; } #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3014,7 +3020,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req _tmp15_ = json_object_get_array_member (_tmp14_, "blogs"); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = json_array_get_elements (_tmp15_); -#line 3011 "TumblrPublishing.c" +#line 3017 "TumblrPublishing.c" { GList* blognode_collection = NULL; GList* blognode_it = NULL; @@ -3022,11 +3028,11 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req blognode_collection = _tmp16_; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) { -#line 3019 "TumblrPublishing.c" +#line 3025 "TumblrPublishing.c" JsonNode* blognode = NULL; #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" blognode = (JsonNode*) blognode_it->data; -#line 3023 "TumblrPublishing.c" +#line 3029 "TumblrPublishing.c" { JsonObject* blog = NULL; JsonNode* _tmp17_ = NULL; @@ -3106,18 +3112,18 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req _g_free0 (name); #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _json_object_unref0 (blog); -#line 3103 "TumblrPublishing.c" +#line 3109 "TumblrPublishing.c" } } #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_list_free0 (blognode_collection); -#line 3108 "TumblrPublishing.c" +#line 3114 "TumblrPublishing.c" } #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _json_object_unref0 (root_object); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (parser); -#line 3114 "TumblrPublishing.c" +#line 3120 "TumblrPublishing.c" } goto __finally34; __catch34_g_error: @@ -3137,7 +3143,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (err); -#line 3134 "TumblrPublishing.c" +#line 3140 "TumblrPublishing.c" } __finally34: #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -3148,7 +3154,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req g_clear_error (&_inner_error_); #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3145 "TumblrPublishing.c" +#line 3151 "TumblrPublishing.c" } } @@ -3184,7 +3190,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis if (!_tmp4_) { #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3181 "TumblrPublishing.c" +#line 3187 "TumblrPublishing.c" } #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = self->priv->session; @@ -3201,21 +3207,21 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis _tmp7_ = err; #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_); -#line 3197 "TumblrPublishing.c" +#line 3203 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self); -#line 3204 "TumblrPublishing.c" +#line 3210 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self); -#line 3211 "TumblrPublishing.c" +#line 3217 "TumblrPublishing.c" } @@ -3267,7 +3273,7 @@ static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane ( spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL); #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (publishing_options_pane); -#line 3263 "TumblrPublishing.c" +#line 3269 "TumblrPublishing.c" } @@ -3280,7 +3286,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis _tmp0_ = self->priv->publishing_options_pane; #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 3276 "TumblrPublishing.c" +#line 3282 "TumblrPublishing.c" PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL; guint _tmp2_ = 0U; PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL; @@ -3297,7 +3303,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE); #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self); -#line 3293 "TumblrPublishing.c" +#line 3299 "TumblrPublishing.c" } #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); @@ -3305,14 +3311,14 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis if (!_tmp5_) { #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3301 "TumblrPublishing.c" +#line 3307 "TumblrPublishing.c" } #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:424: EVENT: user clicked the 'Publish' button in" \ " the publishing options pane"); #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_publish (self); -#line 3307 "TumblrPublishing.c" +#line 3313 "TumblrPublishing.c" } @@ -3325,7 +3331,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout _tmp0_ = self->priv->publishing_options_pane; #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 3320 "TumblrPublishing.c" +#line 3326 "TumblrPublishing.c" PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL; guint _tmp2_ = 0U; PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL; @@ -3342,7 +3348,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE); #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self); -#line 3337 "TumblrPublishing.c" +#line 3343 "TumblrPublishing.c" } #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher)); @@ -3350,14 +3356,14 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout if (!_tmp5_) { #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3345 "TumblrPublishing.c" +#line 3351 "TumblrPublishing.c" } #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:437: EVENT: user clicked the 'Logout' button in " \ "the publishing options pane"); #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_logout (self); -#line 3351 "TumblrPublishing.c" +#line 3357 "TumblrPublishing.c" } @@ -3399,7 +3405,7 @@ gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPubli result = _tmp7_; #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 3393 "TumblrPublishing.c" +#line 3399 "TumblrPublishing.c" } @@ -3408,28 +3414,28 @@ static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gc result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b); #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 3402 "TumblrPublishing.c" +#line 3408 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) { #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published); -#line 3409 "TumblrPublishing.c" +#line 3415 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) { #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err); -#line 3416 "TumblrPublishing.c" +#line 3422 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) { #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete); -#line 3423 "TumblrPublishing.c" +#line 3429 "TumblrPublishing.c" } @@ -3519,7 +3525,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl if (!_tmp9_) { #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3512 "TumblrPublishing.c" +#line 3518 "TumblrPublishing.c" } #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = self->priv->host; @@ -3539,7 +3545,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl _tmp14_ = publishables; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14__length1 = publishables_length1; -#line 3532 "TumblrPublishing.c" +#line 3538 "TumblrPublishing.c" { SpitPublishingPublishable** p_collection = NULL; gint p_collection_length1 = 0; @@ -3551,14 +3557,14 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl p_collection_length1 = _tmp14__length1; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) { -#line 3544 "TumblrPublishing.c" +#line 3550 "TumblrPublishing.c" SpitPublishingPublishable* _tmp15_ = NULL; SpitPublishingPublishable* p = NULL; #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp15_ = _g_object_ref0 (p_collection[p_it]); #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" p = _tmp15_; -#line 3551 "TumblrPublishing.c" +#line 3557 "TumblrPublishing.c" { GeeArrayList* _tmp16_ = NULL; SpitPublishingPublishable* _tmp17_ = NULL; @@ -3572,7 +3578,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (p); -#line 3565 "TumblrPublishing.c" +#line 3571 "TumblrPublishing.c" } } } @@ -3634,7 +3640,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl _g_object_unref0 (sorted_list); #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL); -#line 3627 "TumblrPublishing.c" +#line 3633 "TumblrPublishing.c" } @@ -3653,7 +3659,7 @@ static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingT _tmp1_ = self->priv->host; #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_publishing_plugin_host_install_success_pane (_tmp1_); -#line 3646 "TumblrPublishing.c" +#line 3652 "TumblrPublishing.c" } @@ -3674,7 +3680,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish if (!_tmp0_) { #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3667 "TumblrPublishing.c" +#line 3673 "TumblrPublishing.c" } #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = completed_fraction; @@ -3697,7 +3703,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish _tmp5_ = completed_fraction; #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ (_tmp4_, _tmp5_, _tmp3__target); -#line 3689 "TumblrPublishing.c" +#line 3695 "TumblrPublishing.c" } @@ -3718,7 +3724,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum if (!_tmp0_) { #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3710 "TumblrPublishing.c" +#line 3716 "TumblrPublishing.c" } #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = num_published; @@ -3739,7 +3745,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self); #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_show_success_pane (self); -#line 3730 "TumblrPublishing.c" +#line 3736 "TumblrPublishing.c" } @@ -3763,7 +3769,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr if (!_tmp0_) { #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3754 "TumblrPublishing.c" +#line 3760 "TumblrPublishing.c" } #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = err; @@ -3790,7 +3796,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr _tmp8_ = err; #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_); -#line 3780 "TumblrPublishing.c" +#line 3786 "TumblrPublishing.c" } @@ -3811,7 +3817,7 @@ static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblr self->priv->running = FALSE; #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_attempt_start (self); -#line 3800 "TumblrPublishing.c" +#line 3806 "TumblrPublishing.c" } @@ -3826,7 +3832,7 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub if (_tmp0_) { #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3815 "TumblrPublishing.c" +#line 3821 "TumblrPublishing.c" } #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:539: TumblrPublisher: starting interaction."); @@ -3836,7 +3842,7 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub _tmp1_ = publishing_tumblr_tumblr_publisher_is_persistent_session_valid (self); #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp1_) { -#line 3825 "TumblrPublishing.c" +#line 3831 "TumblrPublishing.c" PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; @@ -3861,14 +3867,14 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub _g_free0 (_tmp6_); #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp4_); -#line 3849 "TumblrPublishing.c" +#line 3855 "TumblrPublishing.c" } else { #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:548: attempt start: no persistent session availa" \ "ble; showing login welcome pane"); #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_do_show_authentication_pane (self, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO); -#line 3855 "TumblrPublishing.c" +#line 3861 "TumblrPublishing.c" } } @@ -3885,26 +3891,26 @@ static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublish if (_tmp0_) { #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 3872 "TumblrPublishing.c" +#line 3878 "TumblrPublishing.c" } #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->was_started; #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp1_) { -#line 3878 "TumblrPublishing.c" +#line 3884 "TumblrPublishing.c" const gchar* _tmp2_ = NULL; #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \ "ble."); #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_error ("TumblrPublishing.vala:559: %s", _tmp2_); -#line 3884 "TumblrPublishing.c" +#line 3890 "TumblrPublishing.c" } #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_debug ("TumblrPublishing.vala:561: TumblrPublisher: starting interaction."); #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_attempt_start (self); -#line 3890 "TumblrPublishing.c" +#line 3896 "TumblrPublishing.c" } @@ -3916,7 +3922,7 @@ static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublishe g_debug ("TumblrPublishing.vala:567: TumblrPublisher: stop( ) invoked."); #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->running = FALSE; -#line 3902 "TumblrPublishing.c" +#line 3908 "TumblrPublishing.c" } @@ -3935,21 +3941,21 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self); -#line 3921 "TumblrPublishing.c" +#line 3927 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) { #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self); -#line 3928 "TumblrPublishing.c" +#line 3934 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked ((PublishingTumblrTumblrPublisherAuthenticationPane*) self); -#line 3935 "TumblrPublishing.c" +#line 3941 "TumblrPublishing.c" } @@ -3969,15 +3975,15 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ _g_object_unref0 (self->priv->pane_widget); #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->pane_widget = _tmp0_; -#line 3955 "TumblrPublishing.c" +#line 3961 "TumblrPublishing.c" { GtkBuilder* _tmp1_ = NULL; GtkBuilder* _tmp2_ = NULL; GtkBuilder* _tmp3_ = NULL; - GtkAlignment* align = NULL; + GtkWidget* content = NULL; GtkBuilder* _tmp4_ = NULL; GObject* _tmp5_ = NULL; - GtkAlignment* _tmp6_ = NULL; + GtkWidget* _tmp6_ = NULL; GtkLabel* message_label = NULL; GtkBuilder* _tmp7_ = NULL; GObject* _tmp8_ = NULL; @@ -3995,12 +4001,16 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ GtkEntry* _tmp27_ = NULL; GtkEntry* _tmp28_ = NULL; GtkButton* _tmp29_ = NULL; - GtkAlignment* _tmp30_ = NULL; - GtkBox* _tmp31_ = NULL; - PublishingTumblrTumblrPublisher* _tmp32_ = NULL; - SpitPublishingPluginHost* _tmp33_ = NULL; - SpitPublishingPluginHost* _tmp34_ = NULL; - GtkButton* _tmp35_ = NULL; + GtkWidget* _tmp30_ = NULL; + GtkContainer* _tmp31_ = NULL; + GtkContainer* _tmp32_ = NULL; + GtkWidget* _tmp33_ = NULL; + GtkBox* _tmp34_ = NULL; + GtkWidget* _tmp35_ = NULL; + PublishingTumblrTumblrPublisher* _tmp36_ = NULL; + SpitPublishingPluginHost* _tmp37_ = NULL; + SpitPublishingPluginHost* _tmp38_ = NULL; + GtkButton* _tmp39_ = NULL; #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = gtk_builder_new (); #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4013,7 +4023,7 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_); #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 3999 "TumblrPublishing.c" +#line 4009 "TumblrPublishing.c" goto __catch36_g_error; } #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4023,11 +4033,11 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = self->priv->builder; #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp5_ = gtk_builder_get_object (_tmp4_, "alignment"); + _tmp5_ = gtk_builder_get_object (_tmp4_, "content"); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp5_) : NULL); + _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL); #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - align = _tmp6_; + content = _tmp6_; #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = self->priv->builder; #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4042,7 +4052,7 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ switch (_tmp10_) { #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO: -#line 4028 "TumblrPublishing.c" +#line 4038 "TumblrPublishing.c" { GtkLabel* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; @@ -4054,11 +4064,11 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ gtk_label_set_text (_tmp11_, _tmp12_); #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 4040 "TumblrPublishing.c" +#line 4050 "TumblrPublishing.c" } #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER: -#line 4044 "TumblrPublishing.c" +#line 4054 "TumblrPublishing.c" { GtkLabel* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; @@ -4081,12 +4091,12 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ _g_free0 (_tmp17_); #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 4067 "TumblrPublishing.c" +#line 4077 "TumblrPublishing.c" } default: #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 4072 "TumblrPublishing.c" +#line 4082 "TumblrPublishing.c" } #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp18_ = self->priv->builder; @@ -4131,51 +4141,61 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (_tmp29_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp30_ = align; + _tmp30_ = content; #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp31_ = self->priv->pane_widget; + _tmp31_ = gtk_widget_get_parent (_tmp30_); #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget)); -#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp32_ = publisher; -#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp33_ = publishing_tumblr_tumblr_publisher_get_host (_tmp32_); -#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp34_ = _tmp33_; + _tmp32_ = _tmp31_; +#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp33_ = content; +#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + gtk_container_remove (_tmp32_, _tmp33_); #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp35_ = self->priv->login_button; + _tmp34_ = self->priv->pane_widget; #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - spit_publishing_plugin_host_set_dialog_default_widget (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget)); + _tmp35_ = content; #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (_tmp34_); + gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), _tmp35_); +#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp36_ = publisher; +#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp37_ = publishing_tumblr_tumblr_publisher_get_host (_tmp36_); +#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp38_ = _tmp37_; +#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp39_ = self->priv->login_button; +#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + spit_publishing_plugin_host_set_dialog_default_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); +#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_object_unref0 (_tmp38_); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (message_label); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (align); -#line 4138 "TumblrPublishing.c" + _g_object_unref0 (content); +#line 4158 "TumblrPublishing.c" } goto __finally36; __catch36_g_error: { GError* e = NULL; - const gchar* _tmp36_ = NULL; - GError* _tmp37_ = NULL; - const gchar* _tmp38_ = NULL; + const gchar* _tmp40_ = NULL; + GError* _tmp41_ = NULL; + const gchar* _tmp42_ = NULL; #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _inner_error_; #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _inner_error_ = NULL; -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp36_ = _ ("Could not load UI: %s"); -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp37_ = e; -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp38_ = _tmp37_->message; -#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_warning (_tmp36_, _tmp38_); +#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp40_ = _ ("Could not load UI: %s"); +#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp41_ = e; +#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp42_ = _tmp41_->message; +#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_warning (_tmp40_, _tmp42_); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (e); -#line 4161 "TumblrPublishing.c" +#line 4181 "TumblrPublishing.c" } __finally36: #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" @@ -4186,18 +4206,18 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ g_clear_error (&_inner_error_); #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 4172 "TumblrPublishing.c" +#line 4192 "TumblrPublishing.c" } #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 4176 "TumblrPublishing.c" +#line 4196 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) { #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_authentication_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, publisher, mode); -#line 4183 "TumblrPublishing.c" +#line 4203 "TumblrPublishing.c" } @@ -4205,17 +4225,17 @@ GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_wi GtkWidget* result = NULL; GtkButton* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL); #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL); +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->login_button; -#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp1_; -#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4201 "TumblrPublishing.c" +#line 4221 "TumblrPublishing.c" } @@ -4224,37 +4244,37 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_butt const gchar* _tmp1_ = NULL; GtkEntry* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->username_entry; -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = self->priv->password_entry; -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = gtk_entry_get_text (_tmp2_); -#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_); -#line 4222 "TumblrPublishing.c" +#line 4242 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) { -#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); +#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self); -#line 4231 "TumblrPublishing.c" +#line 4251 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) { -#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); +#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self); -#line 4240 "TumblrPublishing.c" +#line 4260 "TumblrPublishing.c" } @@ -4264,39 +4284,39 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_ guint _tmp2_ = 0U; guint _tmp3_ = 0U; GtkButton* _tmp7_ = NULL; -#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self)); +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->username_entry; -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = gtk_entry_get_text_length (_tmp1_); -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = _tmp2_; -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp3_ > ((guint) 0)) { -#line 4260 "TumblrPublishing.c" +#line 4280 "TumblrPublishing.c" GtkEntry* _tmp4_ = NULL; guint _tmp5_ = 0U; guint _tmp6_ = 0U; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = self->priv->password_entry; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = gtk_entry_get_text_length (_tmp4_); -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = _tmp5_; -#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _tmp6_ > ((guint) 0); -#line 4272 "TumblrPublishing.c" +#line 4292 "TumblrPublishing.c" } else { -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = FALSE; -#line 4276 "TumblrPublishing.c" +#line 4296 "TumblrPublishing.c" } -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = self->priv->login_button; -#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_); -#line 4282 "TumblrPublishing.c" +#line 4302 "TumblrPublishing.c" } @@ -4305,30 +4325,30 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_ge GtkWidget* result = NULL; GtkBox* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->pane_widget; -#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp1_; -#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4301 "TumblrPublishing.c" +#line 4321 "TumblrPublishing.c" } static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherAuthenticationPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; -#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4314 "TumblrPublishing.c" +#line 4334 "TumblrPublishing.c" } @@ -4337,31 +4357,31 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_ GtkEntry* _tmp0_ = NULL; GtkEntry* _tmp1_ = NULL; GtkButton* _tmp2_ = NULL; -#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); +#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->username_entry; -#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); +#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->password_entry; -#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_entry_set_activates_default (_tmp1_, TRUE); #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + gtk_entry_set_activates_default (_tmp1_, TRUE); +#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = self->priv->login_button; -#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE); #line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE); +#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self); -#line 4339 "TumblrPublishing.c" +#line 4359 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherAuthenticationPane * self; -#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane); -#line 4347 "TumblrPublishing.c" +#line 4367 "TumblrPublishing.c" } @@ -4380,19 +4400,19 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GVa data1 = closure->data; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" data2 = param_values->data[0].v_pointer; -#line 4366 "TumblrPublishing.c" +#line 4386 "TumblrPublishing.c" } else { #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" data1 = param_values->data[0].v_pointer; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" data2 = closure->data; -#line 4372 "TumblrPublishing.c" +#line 4392 "TumblrPublishing.c" } #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2); -#line 4378 "TumblrPublishing.c" +#line 4398 "TumblrPublishing.c" } @@ -4421,7 +4441,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (P _tmp3_ = g_strdup (_tmp2_); #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_; -#line 4407 "TumblrPublishing.c" +#line 4427 "TumblrPublishing.c" } @@ -4436,7 +4456,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishi iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed; #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled; -#line 4422 "TumblrPublishing.c" +#line 4442 "TumblrPublishing.c" } @@ -4445,7 +4465,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_instance_init self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_PRIVATE (self); #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->pane_widget = NULL; -#line 4431 "TumblrPublishing.c" +#line 4451 "TumblrPublishing.c" } @@ -4465,7 +4485,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GOb _g_object_unref0 (self->priv->login_button); #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_authentication_pane_parent_class)->finalize (obj); -#line 4451 "TumblrPublishing.c" +#line 4471 "TumblrPublishing.c" } @@ -4488,86 +4508,86 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) { static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) { -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_tumblr_size_entry_ref (self) : NULL; -#line 4476 "TumblrPublishing.c" +#line 4496 "TumblrPublishing.c" } static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry** self, int length) { PublishingTumblrSizeEntry** result; int i; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = g_new0 (PublishingTumblrSizeEntry*, length + 1); -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (i = 0; i < length; i++) { -#line 4487 "TumblrPublishing.c" +#line 4507 "TumblrPublishing.c" PublishingTumblrSizeEntry* _tmp0_ = NULL; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]); -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result[i] = _tmp0_; -#line 4493 "TumblrPublishing.c" +#line 4513 "TumblrPublishing.c" } -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4497 "TumblrPublishing.c" +#line 4517 "TumblrPublishing.c" } static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) { -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_tumblr_blog_entry_ref (self) : NULL; -#line 4504 "TumblrPublishing.c" +#line 4524 "TumblrPublishing.c" } static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry** self, int length) { PublishingTumblrBlogEntry** result; int i; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = g_new0 (PublishingTumblrBlogEntry*, length + 1); -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (i = 0; i < length; i++) { -#line 4515 "TumblrPublishing.c" +#line 4535 "TumblrPublishing.c" PublishingTumblrBlogEntry* _tmp0_ = NULL; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]); -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result[i] = _tmp0_; -#line 4521 "TumblrPublishing.c" +#line 4541 "TumblrPublishing.c" } -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 4525 "TumblrPublishing.c" +#line 4545 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4532 "TumblrPublishing.c" +#line 4552 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) { -#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4539 "TumblrPublishing.c" +#line 4559 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4546 "TumblrPublishing.c" +#line 4566 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 4553 "TumblrPublishing.c" +#line 4573 "TumblrPublishing.c" } @@ -4588,73 +4608,73 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p PublishingTumblrBlogEntry** _tmp9_ = NULL; gint _tmp9__length1 = 0; GError * _inner_error_ = NULL; -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (username != NULL, NULL); -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = (PublishingTumblrTumblrPublisherPublishingOptionsPane*) g_object_new (object_type, NULL); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_object_ref_sink (_tmp0_); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->pane_widget = _tmp0_; #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->pane_widget = _tmp0_; +#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = username; -#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = g_strdup (_tmp1_); -#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->username); -#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->username = _tmp2_; #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->username = _tmp2_; +#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = publisher; -#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->publisher); -#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->publisher = _tmp4_; #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->publisher = _tmp4_; +#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = media_type; -#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->media_type = _tmp5_; #line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->media_type = _tmp5_; +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = sizes; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6__length1 = sizes_length1; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup7 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_); -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7__length1 = _tmp6__length1; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL); -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->sizes = _tmp7_; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->sizes_length1 = _tmp7__length1; -#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->_sizes_size_ = self->priv->sizes_length1; #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->_sizes_size_ = self->priv->sizes_length1; +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = blogs; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8__length1 = blogs_length1; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_); -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9__length1 = _tmp8__length1; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL); -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blogs = _tmp9_; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blogs_length1 = _tmp9__length1; -#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->_blogs_size_ = self->priv->blogs_length1; -#line 4640 "TumblrPublishing.c" +#line 4660 "TumblrPublishing.c" { GtkBuilder* _tmp10_ = NULL; GtkBuilder* _tmp11_ = NULL; @@ -4693,162 +4713,162 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p SpitPublishingPublisherMediaType _tmp43_ = 0; GtkButton* _tmp47_ = NULL; GtkButton* _tmp48_ = NULL; -#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = gtk_builder_new (); -#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->builder); -#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->builder = _tmp10_; #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->builder = _tmp10_; +#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = self->priv->builder; -#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_); -#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 4691 "TumblrPublishing.c" +#line 4711 "TumblrPublishing.c" goto __catch37_g_error; } -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp12_ = self->priv->builder; -#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_builder_connect_signals (_tmp12_, NULL); -#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = self->priv->builder; -#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "tumblr_pane"); -#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox)); -#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->pane_widget); -#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->pane_widget = _tmp15_; #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->pane_widget = _tmp15_; +#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = self->priv->builder; -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp17_ = gtk_builder_get_object (_tmp16_, "upload_info_label"); -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel)); -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->upload_info_label); -#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->upload_info_label = _tmp18_; #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->upload_info_label = _tmp18_; +#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp19_ = self->priv->builder; -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp20_ = gtk_builder_get_object (_tmp19_, "logout_button"); -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton)); -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->logout_button); -#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->logout_button = _tmp21_; #line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->logout_button = _tmp21_; +#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp22_ = self->priv->builder; -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp23_ = gtk_builder_get_object (_tmp22_, "publish_button"); -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton)); -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->publish_button); -#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->publish_button = _tmp24_; #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->publish_button = _tmp24_; +#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp25_ = self->priv->builder; -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo"); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText)); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->size_combo); -#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->size_combo = _tmp27_; #line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->size_combo = _tmp27_; +#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp28_ = self->priv->builder; -#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp29_ = gtk_builder_get_object (_tmp28_, "size_label"); -#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel)); -#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->size_label); -#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->size_label = _tmp30_; #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->size_label = _tmp30_; +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp31_ = self->priv->builder; -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp32_ = gtk_builder_get_object (_tmp31_, "blog_combo"); -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_text_get_type (), GtkComboBoxText)); -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->blog_combo); -#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->blog_combo = _tmp33_; #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->blog_combo = _tmp33_; +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp34_ = self->priv->builder; -#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp35_ = gtk_builder_get_object (_tmp34_, "blog_label"); -#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_label_get_type (), GtkLabel)); -#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->blog_label); -#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blog_label = _tmp36_; -#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp37_ = _ ("You are logged into Tumblr as %s.\n\n"); -#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp38_ = self->priv->username; -#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp39_ = g_strdup_printf (_tmp37_, _tmp38_); -#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - upload_label_text = _tmp39_; #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + upload_label_text = _tmp39_; +#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp40_ = self->priv->upload_info_label; -#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp41_ = upload_label_text; -#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_label_set_label (_tmp40_, _tmp41_); -#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self); #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self); +#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp42_ = self->priv->blog_combo; -#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0); -#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp43_ = media_type; -#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp43_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) { -#line 4802 "TumblrPublishing.c" +#line 4822 "TumblrPublishing.c" GtkComboBoxText* _tmp44_ = NULL; -#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self); #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self); +#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp44_ = self->priv->size_combo; -#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0); -#line 4810 "TumblrPublishing.c" +#line 4830 "TumblrPublishing.c" } else { GtkComboBoxText* _tmp45_ = NULL; GtkLabel* _tmp46_ = NULL; -#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp45_ = self->priv->size_combo; -#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE); #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE); +#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp46_ = self->priv->size_label; -#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE); -#line 4822 "TumblrPublishing.c" +#line 4842 "TumblrPublishing.c" } -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp47_ = self->priv->logout_button; -#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); +#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp48_ = self->priv->publish_button; -#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (_tmp48_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0); -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (upload_label_text); -#line 4834 "TumblrPublishing.c" +#line 4854 "TumblrPublishing.c" } goto __finally37; __catch37_g_error: @@ -4857,132 +4877,132 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p const gchar* _tmp49_ = NULL; GError* _tmp50_ = NULL; const gchar* _tmp51_ = NULL; -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _inner_error_; -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _inner_error_ = NULL; -#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp49_ = _ ("Could not load UI: %s"); -#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp50_ = e; -#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp51_ = _tmp50_->message; -#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_warning (_tmp49_, _tmp51_); -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (e); -#line 4857 "TumblrPublishing.c" +#line 4877 "TumblrPublishing.c" } __finally37: -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_clear_error (&_inner_error_); -#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return NULL; -#line 4868 "TumblrPublishing.c" +#line 4888 "TumblrPublishing.c" } -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 4872 "TumblrPublishing.c" +#line 4892 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) { -#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username); -#line 4879 "TumblrPublishing.c" +#line 4899 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { -#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); +#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 4888 "TumblrPublishing.c" +#line 4908 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { -#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); -#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (self, "publish"); -#line 4897 "TumblrPublishing.c" +#line 4917 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { PublishingTumblrBlogEntry** _tmp0_ = NULL; gint _tmp0__length1 = 0; -#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->blogs; -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0__length1 = self->priv->blogs_length1; -#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 4912 "TumblrPublishing.c" +#line 4932 "TumblrPublishing.c" PublishingTumblrBlogEntry** _tmp1_ = NULL; gint _tmp1__length1 = 0; GtkComboBoxText* _tmp6_ = NULL; PublishingTumblrTumblrPublisher* _tmp7_ = NULL; gint _tmp8_ = 0; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->blogs; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1__length1 = self->priv->blogs_length1; -#line 4922 "TumblrPublishing.c" +#line 4942 "TumblrPublishing.c" { PublishingTumblrBlogEntry** b_collection = NULL; gint b_collection_length1 = 0; gint _b_collection_size_ = 0; gint b_it = 0; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" b_collection = _tmp1_; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" b_collection_length1 = _tmp1__length1; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) { -#line 4934 "TumblrPublishing.c" +#line 4954 "TumblrPublishing.c" PublishingTumblrBlogEntry* _tmp2_ = NULL; PublishingTumblrBlogEntry* b = NULL; -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]); -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" b = _tmp2_; -#line 4941 "TumblrPublishing.c" +#line 4961 "TumblrPublishing.c" { GtkComboBoxText* _tmp3_ = NULL; PublishingTumblrBlogEntry* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = self->priv->blog_combo; -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = b; -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _tmp4_->blog; -#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_combo_box_text_append_text (_tmp3_, _tmp5_); -#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_tumblr_blog_entry_unref0 (b); -#line 4956 "TumblrPublishing.c" +#line 4976 "TumblrPublishing.c" } } } -#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = self->priv->blog_combo; -#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = self->priv->publisher; -#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_); -#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_); -#line 4968 "TumblrPublishing.c" +#line 4988 "TumblrPublishing.c" } } @@ -4991,88 +5011,88 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_c PublishingTumblrTumblrPublisher* _tmp0_ = NULL; GtkComboBoxText* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->publisher; -#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->blog_combo; -#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_); -#line 4987 "TumblrPublishing.c" +#line 5007 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { PublishingTumblrSizeEntry** _tmp0_ = NULL; gint _tmp0__length1 = 0; -#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->sizes; -#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0__length1 = self->priv->sizes_length1; -#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp0_ != NULL) { -#line 5002 "TumblrPublishing.c" +#line 5022 "TumblrPublishing.c" PublishingTumblrSizeEntry** _tmp1_ = NULL; gint _tmp1__length1 = 0; GtkComboBoxText* _tmp6_ = NULL; PublishingTumblrTumblrPublisher* _tmp7_ = NULL; gint _tmp8_ = 0; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->sizes; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1__length1 = self->priv->sizes_length1; -#line 5012 "TumblrPublishing.c" +#line 5032 "TumblrPublishing.c" { PublishingTumblrSizeEntry** e_collection = NULL; gint e_collection_length1 = 0; gint _e_collection_size_ = 0; gint e_it = 0; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e_collection = _tmp1_; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e_collection_length1 = _tmp1__length1; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) { -#line 5024 "TumblrPublishing.c" +#line 5044 "TumblrPublishing.c" PublishingTumblrSizeEntry* _tmp2_ = NULL; PublishingTumblrSizeEntry* e = NULL; -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]); -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _tmp2_; -#line 5031 "TumblrPublishing.c" +#line 5051 "TumblrPublishing.c" { GtkComboBoxText* _tmp3_ = NULL; PublishingTumblrSizeEntry* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = self->priv->size_combo; -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = e; -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _tmp4_->title; -#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_combo_box_text_append_text (_tmp3_, _tmp5_); -#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_tumblr_size_entry_unref0 (e); -#line 5046 "TumblrPublishing.c" +#line 5066 "TumblrPublishing.c" } } } -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = self->priv->size_combo; -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = self->priv->publisher; -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_); -#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_); -#line 5058 "TumblrPublishing.c" +#line 5078 "TumblrPublishing.c" } } @@ -5081,35 +5101,35 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_c PublishingTumblrTumblrPublisher* _tmp0_ = NULL; GtkComboBoxText* _tmp1_ = NULL; gint _tmp2_ = 0; -#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->publisher; -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->size_combo; -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox)); -#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_); -#line 5077 "TumblrPublishing.c" +#line 5097 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { -#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); +#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (self, "publish"); -#line 5086 "TumblrPublishing.c" +#line 5106 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) { -#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self)); +#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (self, "logout"); -#line 5095 "TumblrPublishing.c" +#line 5115 "TumblrPublishing.c" } @@ -5118,56 +5138,56 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_rea GtkWidget* result = NULL; GtkBox* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); +#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->pane_widget; -#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget)); -#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp1_; -#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5114 "TumblrPublishing.c" +#line 5134 "TumblrPublishing.c" } static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherPublishingOptionsPane * self; SpitPublishingDialogPaneGeometryOptions result = 0; -#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE; -#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5127 "TumblrPublishing.c" +#line 5147 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { -#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 5134 "TumblrPublishing.c" +#line 5154 "TumblrPublishing.c" } static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) { -#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self); -#line 5141 "TumblrPublishing.c" +#line 5161 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) { PublishingTumblrTumblrPublisherPublishingOptionsPane * self; -#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); #line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0); + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0); +#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0); -#line 5153 "TumblrPublishing.c" +#line 5173 "TumblrPublishing.c" } @@ -5175,125 +5195,125 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p PublishingTumblrTumblrPublisherPublishingOptionsPane * self; guint _tmp0_ = 0U; guint _tmp1_ = 0U; -#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); +#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE); -#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self); #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self); +#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE); -#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self); -#line 5171 "TumblrPublishing.c" +#line 5191 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass) { -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = g_type_class_peek_parent (klass); -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate)); -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); -#line 5186 "TumblrPublishing.c" +#line 5206 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) { -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface); -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled; -#line 5201 "TumblrPublishing.c" +#line 5221 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) { gchar* _tmp0_ = NULL; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self); -#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->pane_widget = NULL; #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->upload_info_label = NULL; + self->priv->pane_widget = NULL; #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->size_label = NULL; + self->priv->upload_info_label = NULL; #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->blog_label = NULL; + self->priv->size_label = NULL; #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->logout_button = NULL; + self->priv->blog_label = NULL; #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->publish_button = NULL; + self->priv->logout_button = NULL; #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->size_combo = NULL; + self->priv->publish_button = NULL; #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->blog_combo = NULL; + self->priv->size_combo = NULL; #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->blog_combo = NULL; +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->sizes = NULL; -#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->sizes_length1 = 0; -#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->_sizes_size_ = self->priv->sizes_length1; #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->_sizes_size_ = self->priv->sizes_length1; +#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blogs = NULL; -#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blogs_length1 = 0; -#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->_blogs_size_ = self->priv->blogs_length1; #line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->_blogs_size_ = self->priv->blogs_length1; +#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = g_strdup (""); -#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->username = _tmp0_; #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->username = _tmp0_; +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->publisher = NULL; -#line 5243 "TumblrPublishing.c" +#line 5263 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject* obj) { PublishingTumblrTumblrPublisherPublishingOptionsPane * self; -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane); -#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->builder); #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->pane_widget); + _g_object_unref0 (self->priv->builder); #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->upload_info_label); + _g_object_unref0 (self->priv->pane_widget); #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->size_label); + _g_object_unref0 (self->priv->upload_info_label); #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->blog_label); + _g_object_unref0 (self->priv->size_label); #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->logout_button); + _g_object_unref0 (self->priv->blog_label); #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->publish_button); + _g_object_unref0 (self->priv->logout_button); #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->size_combo); + _g_object_unref0 (self->priv->publish_button); #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_object_unref0 (self->priv->blog_combo); + _g_object_unref0 (self->priv->size_combo); #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL); + _g_object_unref0 (self->priv->blog_combo); #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL); + self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL); #line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (self->priv->username); + self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL); #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (self->priv->username); +#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (self->priv->publisher); -#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj); -#line 5279 "TumblrPublishing.c" +#line 5299 "TumblrPublishing.c" } @@ -5318,24 +5338,24 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t PublishingTumblrTumblrPublisherTransaction* self = NULL; PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; PublishingRESTSupportHttpMethod _tmp1_ = 0; -#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); -#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = session; -#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = method; -#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_); -#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5314 "TumblrPublishing.c" +#line 5334 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) { -#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, method); -#line 5321 "TumblrPublishing.c" +#line 5341 "TumblrPublishing.c" } @@ -5354,82 +5374,82 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; gboolean _tmp12_ = FALSE; -#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); -#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (uri != NULL, NULL); -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = session; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = uri; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = method; -#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_); -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = session; -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp3_); -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _tmp4_; -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp5_); -#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp5_); #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1"); + _g_free0 (_tmp5_); #line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0"); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1"); #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0"); +#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = session; -#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp6_); -#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = _tmp7_; -#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp8_); -#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp8_); #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY); + _g_free0 (_tmp8_); #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY); +#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9_ = session; -#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp9_); -#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = _tmp10_; -#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp12_ = _tmp11_ != NULL; -#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp11_); -#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp12_) { -#line 5390 "TumblrPublishing.c" +#line 5410 "TumblrPublishing.c" PublishingTumblrTumblrPublisherSession* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = session; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp13_); -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp15_ = _tmp14_; -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp15_); -#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp15_); -#line 5404 "TumblrPublishing.c" +#line 5424 "TumblrPublishing.c" } -#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5408 "TumblrPublishing.c" +#line 5428 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) { -#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, uri, method); -#line 5415 "TumblrPublishing.c" +#line 5435 "TumblrPublishing.c" } @@ -5438,46 +5458,46 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish PublishingRESTSupportSession* _tmp0_ = NULL; PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction); #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction); +#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); -#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_session_unref0 (_tmp1_); -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 5444 "TumblrPublishing.c" +#line 5464 "TumblrPublishing.c" } else { -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_clear_error (&_inner_error_); -#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 5452 "TumblrPublishing.c" +#line 5472 "TumblrPublishing.c" } } } static void publishing_tumblr_tumblr_publisher_transaction_class_init (PublishingTumblrTumblrPublisherTransactionClass * klass) { -#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_transaction_parent_class = g_type_class_peek_parent (klass); -#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_tumblr_tumblr_publisher_transaction_real_execute; -#line 5463 "TumblrPublishing.c" +#line 5483 "TumblrPublishing.c" } @@ -5504,49 +5524,49 @@ PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tu gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (username != NULL, NULL); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (password != NULL, NULL); #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (password != NULL, NULL); +#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = session; -#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); -#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = username; -#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = soup_uri_encode (_tmp1_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA); -#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = _tmp2_; -#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp3_); -#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp3_); #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (_tmp3_); +#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = password; -#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_); #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_); +#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth"); -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5518 "TumblrPublishing.c" +#line 5538 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) { -#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password); -#line 5525 "TumblrPublishing.c" +#line 5545 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass * klass) { -#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5532 "TumblrPublishing.c" +#line 5552 "TumblrPublishing.c" } @@ -5569,29 +5589,29 @@ GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session) { PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL; PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL; -#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = session; -#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "http://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST); -#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5563 "TumblrPublishing.c" +#line 5583 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session) { -#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session); -#line 5570 "TumblrPublishing.c" +#line 5590 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) { -#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass); -#line 5577 "TumblrPublishing.c" +#line 5597 "TumblrPublishing.c" } @@ -5627,62 +5647,62 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ GString* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; gchar* _tmp16_ = NULL; -#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); +#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = g_string_new (""); -#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - s = _tmp0_; #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + s = _tmp0_; +#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = g_new0 (gchar, 2); -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" bytes = _tmp1_; -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" bytes_length1 = 2; -#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _bytes_size_ = bytes_length1; #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _bytes_size_ = bytes_length1; +#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = bytes; -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2__length1 = bytes_length1; -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_[1] = (gchar) 0; -#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp3_ = _tmp2_[1]; #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp3_ = _tmp2_[1]; +#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = data; -#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4__length1 = data_length1; -#line 5639 "TumblrPublishing.c" +#line 5659 "TumblrPublishing.c" { guint8* byte_collection = NULL; gint byte_collection_length1 = 0; gint _byte_collection_size_ = 0; gint byte_it = 0; -#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" byte_collection = _tmp4_; -#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" byte_collection_length1 = _tmp4__length1; -#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) { -#line 5651 "TumblrPublishing.c" +#line 5671 "TumblrPublishing.c" guint8 byte = 0U; -#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" byte = byte_collection[byte_it]; -#line 5655 "TumblrPublishing.c" +#line 5675 "TumblrPublishing.c" { guint8 _tmp5_ = 0U; -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = byte; -#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (((gint) _tmp5_) == 0) { -#line 5662 "TumblrPublishing.c" +#line 5682 "TumblrPublishing.c" GString* _tmp6_ = NULL; -#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = s; -#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_string_append (_tmp6_, "%00"); -#line 5668 "TumblrPublishing.c" +#line 5688 "TumblrPublishing.c" } else { gchar* _tmp7_ = NULL; gint _tmp7__length1 = 0; @@ -5693,57 +5713,57 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ gint _tmp11__length1 = 0; gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; -#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = bytes; -#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7__length1 = bytes_length1; -#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = byte; -#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_[0] = (gchar) _tmp8_; -#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _tmp9_ = _tmp7_[0]; #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _tmp9_ = _tmp7_[0]; +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = s; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = bytes; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11__length1 = bytes_length1; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp12_ = soup_uri_encode ((const gchar*) _tmp11_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA); -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = _tmp12_; -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_string_append (_tmp10_, _tmp13_); -#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp13_); -#line 5703 "TumblrPublishing.c" +#line 5723 "TumblrPublishing.c" } } } } -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14_ = s; -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp15_ = _tmp14_->str; -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = g_strdup (_tmp15_); -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp16_; -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" bytes = (g_free (bytes), NULL); -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_string_free0 (s); -#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5722 "TumblrPublishing.c" +#line 5742 "TumblrPublishing.c" } static gpointer _publishing_rest_support_session_ref0 (gpointer self) { -#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_rest_support_session_ref (self) : NULL; -#line 5729 "TumblrPublishing.c" +#line 5749 "TumblrPublishing.c" } @@ -5756,63 +5776,63 @@ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publi gchar* _tmp4_ = NULL; PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL; PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (blog_url != NULL, NULL); #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:897: Init upload transaction"); + g_return_val_if_fail (blog_url != NULL, NULL); #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:898: Init upload transaction"); +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = session; -#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = publishable; -#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = blog_url; -#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = g_strdup_printf ("http://api.tumblr.com/v2/blog/%s/post", _tmp2_); -#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = _tmp3_; -#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_); -#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp4_); #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (_tmp4_); +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = session; -#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = _publishing_rest_support_session_ref0 (_tmp5_); -#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_session_unref0 (self->priv->session); -#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->session = _tmp6_; -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 5774 "TumblrPublishing.c" +#line 5794 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) { -#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url); -#line 5781 "TumblrPublishing.c" +#line 5801 "TumblrPublishing.c" } static void _vala_array_add22 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 5792 "TumblrPublishing.c" +#line 5812 "TumblrPublishing.c" } -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 5798 "TumblrPublishing.c" +#line 5818 "TumblrPublishing.c" } @@ -5822,53 +5842,53 @@ void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_hea const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; PublishingRESTSupportArgument* _tmp3_ = NULL; -#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self)); -#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (key != NULL); -#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (value != NULL); #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (value != NULL); +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->auth_header_fields; -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0__length1 = self->priv->auth_header_fields_length1; -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = key; -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = value; -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_); -#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _vala_array_add22 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_); -#line 5826 "TumblrPublishing.c" +#line 5846 "TumblrPublishing.c" } static gpointer _publishing_rest_support_argument_ref0 (gpointer self) { -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_rest_support_argument_ref (self) : NULL; -#line 5833 "TumblrPublishing.c" +#line 5853 "TumblrPublishing.c" } static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) { PublishingRESTSupportArgument** result; int i; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = g_new0 (PublishingRESTSupportArgument*, length + 1); -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (i = 0; i < length; i++) { -#line 5844 "TumblrPublishing.c" +#line 5864 "TumblrPublishing.c" PublishingRESTSupportArgument* _tmp0_ = NULL; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _publishing_rest_support_argument_ref0 (self[i]); -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result[i] = _tmp0_; -#line 5850 "TumblrPublishing.c" +#line 5870 "TumblrPublishing.c" } -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5854 "TumblrPublishing.c" +#line 5874 "TumblrPublishing.c" } @@ -5880,31 +5900,31 @@ PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transa gint _tmp1__length1 = 0; PublishingRESTSupportArgument** _tmp2_ = NULL; gint _tmp2__length1 = 0; -#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->auth_header_fields; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0__length1 = self->priv->auth_header_fields_length1; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1__length1 = _tmp0__length1; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _tmp1_; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2__length1 = _tmp1__length1; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (result_length1) { -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *result_length1 = _tmp2__length1; -#line 5884 "TumblrPublishing.c" +#line 5904 "TumblrPublishing.c" } -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp2_; -#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 5890 "TumblrPublishing.c" +#line 5910 "TumblrPublishing.c" } @@ -5912,25 +5932,25 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_ = NULL; -#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL); +#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = g_strdup ("OAuth "); -#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _result_ = _tmp0_; -#line 5904 "TumblrPublishing.c" +#line 5924 "TumblrPublishing.c" { gint i = 0; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = 0; -#line 5909 "TumblrPublishing.c" +#line 5929 "TumblrPublishing.c" { gboolean _tmp1_ = FALSE; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = TRUE; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 5916 "TumblrPublishing.c" +#line 5936 "TumblrPublishing.c" gint _tmp3_ = 0; PublishingRESTSupportArgument** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -5957,115 +5977,115 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h gint _tmp23_ = 0; PublishingRESTSupportArgument** _tmp24_ = NULL; gint _tmp24__length1 = 0; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!_tmp1_) { -#line 5945 "TumblrPublishing.c" +#line 5965 "TumblrPublishing.c" gint _tmp2_ = 0; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = i; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = _tmp2_ + 1; -#line 5951 "TumblrPublishing.c" +#line 5971 "TumblrPublishing.c" } -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = FALSE; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = i; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = self->priv->auth_header_fields; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4__length1 = self->priv->auth_header_fields_length1; -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!(_tmp3_ < _tmp4__length1)) { -#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 5965 "TumblrPublishing.c" +#line 5985 "TumblrPublishing.c" } -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _result_; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = self->priv->auth_header_fields; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6__length1 = self->priv->auth_header_fields_length1; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = i; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = _tmp6_[_tmp7_]; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9_ = _tmp8_->key; -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL); -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_result_); -#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _result_ = _tmp10_; #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _result_ = _tmp10_; +#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = _result_; -#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp12_ = g_strconcat (_tmp11_, "=", NULL); -#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_result_); -#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _result_ = _tmp12_; #line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _result_ = _tmp12_; +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = _result_; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14_ = self->priv->auth_header_fields; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14__length1 = self->priv->auth_header_fields_length1; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp15_ = i; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = _tmp14_[_tmp15_]; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp17_ = _tmp16_->value; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp18_ = g_strconcat ("\"", _tmp17_, NULL); -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp19_ = _tmp18_; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp20_ = g_strconcat (_tmp19_, "\"", NULL); -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp21_ = _tmp20_; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL); -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_result_); -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _result_ = _tmp22_; -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp21_); -#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp19_); -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp23_ = i; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp24_ = self->priv->auth_header_fields; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp24__length1 = self->priv->auth_header_fields_length1; -#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp23_ < (_tmp24__length1 - 1)) { -#line 6031 "TumblrPublishing.c" +#line 6051 "TumblrPublishing.c" const gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp25_ = _result_; -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp26_ = g_strconcat (_tmp25_, ", ", NULL); -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_result_); -#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _result_ = _tmp26_; -#line 6042 "TumblrPublishing.c" +#line 6062 "TumblrPublishing.c" } } } } -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _result_; -#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 6051 "TumblrPublishing.c" +#line 6071 "TumblrPublishing.c" } @@ -6109,13 +6129,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) { if (result_length1) { #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 6095 "TumblrPublishing.c" +#line 6115 "TumblrPublishing.c" } #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp4_; #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6101 "TumblrPublishing.c" +#line 6121 "TumblrPublishing.c" } @@ -6132,7 +6152,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s if (_tmp0_ == NULL) { #line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" separator = ""; -#line 6118 "TumblrPublishing.c" +#line 6138 "TumblrPublishing.c" } #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp3_ = str_array; @@ -6142,7 +6162,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s if (_tmp3_ != NULL) { #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = TRUE; -#line 6128 "TumblrPublishing.c" +#line 6148 "TumblrPublishing.c" } else { gchar** _tmp4_ = NULL; gint _tmp4__length1 = 0; @@ -6152,13 +6172,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp4__length1 = str_array_length1; #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = _tmp4__length1 > 0; -#line 6138 "TumblrPublishing.c" +#line 6158 "TumblrPublishing.c" } #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp2_) { #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 6144 "TumblrPublishing.c" +#line 6164 "TumblrPublishing.c" } else { gboolean _tmp5_ = FALSE; gchar** _tmp6_ = NULL; @@ -6169,7 +6189,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp6__length1 = str_array_length1; #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp6__length1 == -1) { -#line 6155 "TumblrPublishing.c" +#line 6175 "TumblrPublishing.c" gchar** _tmp7_ = NULL; gint _tmp7__length1 = 0; const gchar* _tmp8_ = NULL; @@ -6181,19 +6201,19 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp8_ = _tmp7_[0]; #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_ != NULL; -#line 6167 "TumblrPublishing.c" +#line 6187 "TumblrPublishing.c" } else { #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp5_ = FALSE; -#line 6171 "TumblrPublishing.c" +#line 6191 "TumblrPublishing.c" } #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp1_ = _tmp5_; -#line 6175 "TumblrPublishing.c" +#line 6195 "TumblrPublishing.c" } #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 6179 "TumblrPublishing.c" +#line 6199 "TumblrPublishing.c" gint i = 0; gsize len = 0UL; gint _tmp31_ = 0; @@ -6216,7 +6236,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s const gchar* _tmp62_ = NULL; #line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = (gsize) 1; -#line 6202 "TumblrPublishing.c" +#line 6222 "TumblrPublishing.c" { gboolean _tmp9_ = FALSE; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -6225,7 +6245,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp9_ = TRUE; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { -#line 6211 "TumblrPublishing.c" +#line 6231 "TumblrPublishing.c" gboolean _tmp11_ = FALSE; gboolean _tmp12_ = FALSE; gchar** _tmp13_ = NULL; @@ -6238,13 +6258,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s gsize _tmp30_ = 0UL; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp9_) { -#line 6224 "TumblrPublishing.c" +#line 6244 "TumblrPublishing.c" gint _tmp10_ = 0; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp10_ = i; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp10_ + 1; -#line 6230 "TumblrPublishing.c" +#line 6250 "TumblrPublishing.c" } #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp9_ = FALSE; @@ -6254,7 +6274,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp13__length1 = str_array_length1; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp13__length1 != -1) { -#line 6240 "TumblrPublishing.c" +#line 6260 "TumblrPublishing.c" gint _tmp14_ = 0; gchar** _tmp15_ = NULL; gint _tmp15__length1 = 0; @@ -6266,17 +6286,17 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp15__length1 = str_array_length1; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = _tmp14_ < _tmp15__length1; -#line 6252 "TumblrPublishing.c" +#line 6272 "TumblrPublishing.c" } else { #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp12_ = FALSE; -#line 6256 "TumblrPublishing.c" +#line 6276 "TumblrPublishing.c" } #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp12_) { #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = TRUE; -#line 6262 "TumblrPublishing.c" +#line 6282 "TumblrPublishing.c" } else { gboolean _tmp16_ = FALSE; gchar** _tmp17_ = NULL; @@ -6287,7 +6307,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp17__length1 = str_array_length1; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp17__length1 == -1) { -#line 6273 "TumblrPublishing.c" +#line 6293 "TumblrPublishing.c" gchar** _tmp18_ = NULL; gint _tmp18__length1 = 0; gint _tmp19_ = 0; @@ -6302,21 +6322,21 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp20_ = _tmp18_[_tmp19_]; #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = _tmp20_ != NULL; -#line 6288 "TumblrPublishing.c" +#line 6308 "TumblrPublishing.c" } else { #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp16_ = FALSE; -#line 6292 "TumblrPublishing.c" +#line 6312 "TumblrPublishing.c" } #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp11_ = _tmp16_; -#line 6296 "TumblrPublishing.c" +#line 6316 "TumblrPublishing.c" } #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp11_) { #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; -#line 6302 "TumblrPublishing.c" +#line 6322 "TumblrPublishing.c" } #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp22_ = str_array; @@ -6328,7 +6348,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp24_ = _tmp22_[_tmp23_]; #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp24_ != NULL) { -#line 6314 "TumblrPublishing.c" +#line 6334 "TumblrPublishing.c" gchar** _tmp25_ = NULL; gint _tmp25__length1 = 0; gint _tmp26_ = 0; @@ -6349,24 +6369,24 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp29_ = _tmp28_; #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = _tmp29_; -#line 6335 "TumblrPublishing.c" +#line 6355 "TumblrPublishing.c" } else { #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp21_ = 0; -#line 6339 "TumblrPublishing.c" +#line 6359 "TumblrPublishing.c" } #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp30_ = len; #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp30_ + _tmp21_; -#line 6345 "TumblrPublishing.c" +#line 6365 "TumblrPublishing.c" } } #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp31_ = i; #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp31_ == 0) { -#line 6352 "TumblrPublishing.c" +#line 6372 "TumblrPublishing.c" gchar* _tmp32_ = NULL; #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp32_ = g_strdup (""); @@ -6374,7 +6394,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s result = _tmp32_; #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6360 "TumblrPublishing.c" +#line 6380 "TumblrPublishing.c" } #line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp33_ = i; @@ -6412,7 +6432,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_); #line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp45_; -#line 6398 "TumblrPublishing.c" +#line 6418 "TumblrPublishing.c" { gboolean _tmp46_ = FALSE; #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -6421,7 +6441,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp46_ = TRUE; #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" while (TRUE) { -#line 6407 "TumblrPublishing.c" +#line 6427 "TumblrPublishing.c" gint _tmp48_ = 0; gchar** _tmp49_ = NULL; gint _tmp49__length1 = 0; @@ -6437,13 +6457,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s void* _tmp61_ = NULL; #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (!_tmp46_) { -#line 6423 "TumblrPublishing.c" +#line 6443 "TumblrPublishing.c" gint _tmp47_ = 0; #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp47_ = i; #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" i = _tmp47_ + 1; -#line 6429 "TumblrPublishing.c" +#line 6449 "TumblrPublishing.c" } #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp46_ = FALSE; @@ -6457,7 +6477,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s if (!(_tmp48_ < _tmp49__length1)) { #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" break; -#line 6443 "TumblrPublishing.c" +#line 6463 "TumblrPublishing.c" } #line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp50_ = ptr; @@ -6477,7 +6497,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp56_ = _tmp54_[_tmp55_]; #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp56_ != NULL) { -#line 6463 "TumblrPublishing.c" +#line 6483 "TumblrPublishing.c" gchar** _tmp57_ = NULL; gint _tmp57__length1 = 0; gint _tmp58_ = 0; @@ -6492,11 +6512,11 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp59_ = _tmp57_[_tmp58_]; #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = (const gchar*) _tmp59_; -#line 6478 "TumblrPublishing.c" +#line 6498 "TumblrPublishing.c" } else { #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp53_ = ""; -#line 6482 "TumblrPublishing.c" +#line 6502 "TumblrPublishing.c" } #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp60_ = ptr; @@ -6504,7 +6524,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s _tmp61_ = g_stpcpy (_tmp60_, _tmp53_); #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" ptr = _tmp61_; -#line 6490 "TumblrPublishing.c" +#line 6510 "TumblrPublishing.c" } } #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -6515,7 +6535,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s result = (gchar*) _tmp62_; #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6501 "TumblrPublishing.c" +#line 6521 "TumblrPublishing.c" } else { gchar* _tmp63_ = NULL; #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -6524,7 +6544,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s result = _tmp63_; #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 6510 "TumblrPublishing.c" +#line 6530 "TumblrPublishing.c" } } @@ -6575,45 +6595,45 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( gboolean _tmp75_ = FALSE; SoupMessage* _tmp87_ = NULL; GError * _inner_error_ = NULL; -#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction); #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction); +#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->session; -#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp0_); -#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _tmp1_; -#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp2_); -#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp2_); #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1"); + _g_free0 (_tmp2_); #line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0"); + publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1"); #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0"); +#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = self->priv->session; -#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp3_); -#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _tmp4_; -#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp5_); -#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp5_); #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY); + _g_free0 (_tmp5_); #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY); +#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = self->priv->session; -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp6_); -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = _tmp7_; -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_); -#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp8_); -#line 6599 "TumblrPublishing.c" +#line 6619 "TumblrPublishing.c" { SpitPublishingPublishable* _tmp9_ = NULL; GFile* _tmp10_ = NULL; @@ -6644,118 +6664,118 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( const gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable; -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = _tmp10_; -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp12_ = g_file_get_path (_tmp11_); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = _tmp12_; -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_file_get_contents (_tmp13_, &_tmp14_, &_tmp15_, &_inner_error_); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" payload = _tmp14_; -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" payload_length = _tmp15_; -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp13_); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (_tmp11_); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == G_FILE_ERROR) { -#line 6656 "TumblrPublishing.c" +#line 6676 "TumblrPublishing.c" goto __catch38_g_file_error; } -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_clear_error (&_inner_error_); -#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 6667 "TumblrPublishing.c" +#line 6687 "TumblrPublishing.c" } -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = payload; -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp17_ = string_get_data (_tmp16_, &_tmp17__length1); -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp18_ = _tmp17_; -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp18__length1 = _tmp17__length1; -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp19_ = payload_length; -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp20_ = publishing_tumblr_tumblr_publisher_upload_transaction_encode (self, _tmp18_ + 0, ((gint) _tmp19_) - 0); -#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" reqdata = _tmp20_; -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp21_ = reqdata; -#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp21_); #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo"); + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp21_); #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo"); +#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable; -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp24_ = spit_publishing_publishable_get_publishing_keywords (_tmp22_, &_tmp23_); -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" keywords = _tmp24_; -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" keywords_length1 = _tmp23_; -#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _keywords_size_ = keywords_length1; #line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _keywords_size_ = keywords_length1; +#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp25_ = g_strdup (""); -#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - tags = _tmp25_; #line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + tags = _tmp25_; +#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp26_ = keywords; -#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp26__length1 = keywords_length1; -#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp26_ != NULL) { -#line 6709 "TumblrPublishing.c" +#line 6729 "TumblrPublishing.c" gchar** _tmp27_ = NULL; gint _tmp27__length1 = 0; gchar* _tmp28_ = NULL; -#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp27_ = keywords; -#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp27__length1 = keywords_length1; -#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp28_ = _vala_g_strjoinv (",", _tmp27_, _tmp27__length1); -#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (tags); -#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" tags = _tmp28_; -#line 6723 "TumblrPublishing.c" +#line 6743 "TumblrPublishing.c" } -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp29_ = tags; -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp30_ = soup_uri_encode (_tmp29_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA); -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp31_ = _tmp30_; -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp31_); -#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp31_); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (tags); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (reqdata); -#line 6741 "TumblrPublishing.c" +#line 6761 "TumblrPublishing.c" } goto __finally38; __catch38_g_file_error: @@ -6763,93 +6783,93 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( GError* e = NULL; const gchar* _tmp32_ = NULL; GError* _tmp33_ = NULL; -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" e = _inner_error_; -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _inner_error_ = NULL; -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp32_ = _ ("A temporary file needed for publishing is unavailable"); -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp33_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp32_); -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _inner_error_ = _tmp33_; -#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_error_free0 (e); -#line 6761 "TumblrPublishing.c" +#line 6781 "TumblrPublishing.c" goto __finally38; } __finally38: -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 6775 "TumblrPublishing.c" +#line 6795 "TumblrPublishing.c" } else { -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_clear_error (&_inner_error_); -#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 6785 "TumblrPublishing.c" +#line 6805 "TumblrPublishing.c" } } -#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp34_ = self->priv->session; -#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp35_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self); -#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" authorization_header = _tmp35_; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp36_ = authorization_header; -#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:967: executing upload transaction: authorization" \ +#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:968: executing upload transaction: authorization" \ " header string = '%s'", _tmp36_); -#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp37_ = authorization_header; -#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp37_); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp39_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp38_); -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_arguments = _tmp39_; -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_arguments_length1 = _tmp38_; -#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _request_arguments_size_ = request_arguments_length1; #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _request_arguments_size_ = request_arguments_length1; +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp40_ = request_arguments; -#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp40__length1 = request_arguments_length1; -#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _vala_assert (_tmp40__length1 > 0, "request_arguments.length > 0"); -#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp41_ = g_strdup (""); -#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_data = _tmp41_; -#line 6822 "TumblrPublishing.c" +#line 6842 "TumblrPublishing.c" { gint i = 0; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = 0; -#line 6827 "TumblrPublishing.c" +#line 6847 "TumblrPublishing.c" { gboolean _tmp42_ = FALSE; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp42_ = TRUE; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 6834 "TumblrPublishing.c" +#line 6854 "TumblrPublishing.c" gint _tmp44_ = 0; PublishingRESTSupportArgument** _tmp45_ = NULL; gint _tmp45__length1 = 0; @@ -6872,133 +6892,133 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( gint _tmp60_ = 0; PublishingRESTSupportArgument** _tmp61_ = NULL; gint _tmp61__length1 = 0; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!_tmp42_) { -#line 6859 "TumblrPublishing.c" +#line 6879 "TumblrPublishing.c" gint _tmp43_ = 0; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp43_ = i; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = _tmp43_ + 1; -#line 6865 "TumblrPublishing.c" +#line 6885 "TumblrPublishing.c" } -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp42_ = FALSE; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp44_ = i; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp45_ = request_arguments; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp45__length1 = request_arguments_length1; -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!(_tmp44_ < _tmp45__length1)) { -#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 6879 "TumblrPublishing.c" +#line 6899 "TumblrPublishing.c" } -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp46_ = request_data; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp47_ = request_arguments; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp47__length1 = request_arguments_length1; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp48_ = i; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp49_ = _tmp47_[_tmp48_]; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp50_ = _tmp49_->key; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp51_ = g_strconcat (_tmp50_, "=", NULL); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp52_ = _tmp51_; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp53_ = request_arguments; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp53__length1 = request_arguments_length1; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp54_ = i; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp55_ = _tmp53_[_tmp54_]; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp56_ = _tmp55_->value; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp57_ = g_strconcat (_tmp52_, _tmp56_, NULL); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp58_ = _tmp57_; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp59_ = g_strconcat (_tmp46_, _tmp58_, NULL); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (request_data); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_data = _tmp59_; -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp58_); -#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp52_); #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (_tmp52_); +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp60_ = i; -#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp61_ = request_arguments; -#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp61__length1 = request_arguments_length1; -#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp60_ < (_tmp61__length1 - 1)) { -#line 6929 "TumblrPublishing.c" +#line 6949 "TumblrPublishing.c" const gchar* _tmp62_ = NULL; gchar* _tmp63_ = NULL; -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp62_ = request_data; -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp63_ = g_strconcat (_tmp62_, "&", NULL); -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (request_data); -#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_data = _tmp63_; -#line 6940 "TumblrPublishing.c" +#line 6960 "TumblrPublishing.c" } } } } -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp64_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp65_ = _tmp64_; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp66_ = soup_message_new ("POST", _tmp65_); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp67_ = _tmp66_; -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp65_); -#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - outbound_message = _tmp67_; #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + outbound_message = _tmp67_; +#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp68_ = outbound_message; -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp69_ = request_data; -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp70_ = string_get_data (_tmp69_, &_tmp70__length1); -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp71_ = _tmp70_; -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp71__length1 = _tmp70__length1; -#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" soup_message_set_request (_tmp68_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp71_, (gsize) _tmp71__length1); -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp72_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers; -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp73_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap)); -#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - i = _tmp73_; #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + i = _tmp73_; +#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp74_ = i; -#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp75_ = gee_map_iterator_next (_tmp74_); -#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - cont = _tmp75_; #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + cont = _tmp75_; +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 6983 "TumblrPublishing.c" +#line 7003 "TumblrPublishing.c" gboolean _tmp76_ = FALSE; SoupMessage* _tmp77_ = NULL; SoupMessageHeaders* _tmp78_ = NULL; @@ -7010,142 +7030,142 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute ( gchar* _tmp84_ = NULL; GeeMapIterator* _tmp85_ = NULL; gboolean _tmp86_ = FALSE; -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp76_ = cont; -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!_tmp76_) { -#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 7001 "TumblrPublishing.c" +#line 7021 "TumblrPublishing.c" } -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp77_ = outbound_message; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp78_ = _tmp77_->request_headers; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp79_ = i; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp80_ = gee_map_iterator_get_key (_tmp79_); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp81_ = (gchar*) _tmp80_; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp82_ = i; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp83_ = gee_map_iterator_get_value (_tmp82_); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp84_ = (gchar*) _tmp83_; -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" soup_message_headers_append (_tmp78_, _tmp81_, _tmp84_); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp84_); -#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp81_); #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (_tmp81_); +#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp85_ = i; -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp86_ = gee_map_iterator_next (_tmp85_); -#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" cont = _tmp86_; -#line 7031 "TumblrPublishing.c" +#line 7051 "TumblrPublishing.c" } -#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp87_ = outbound_message; -#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp87_); -#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) { -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_propagate_error (error, _inner_error_); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (i); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (outbound_message); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (request_data); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (authorization_header); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 7061 "TumblrPublishing.c" +#line 7081 "TumblrPublishing.c" } else { -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (i); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (outbound_message); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (request_data); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (authorization_header); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_clear_error (&_inner_error_); -#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return; -#line 7081 "TumblrPublishing.c" +#line 7101 "TumblrPublishing.c" } } -#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (i); -#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (outbound_message); -#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (request_data); -#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (authorization_header); -#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (payload); -#line 7096 "TumblrPublishing.c" +#line 7116 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass) { -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = g_type_class_peek_parent (klass); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_upload_transaction_finalize; -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploadTransactionPrivate)); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_tumblr_tumblr_publisher_upload_transaction_real_execute; -#line 7109 "TumblrPublishing.c" +#line 7129 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) { -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE (self); -#line 7116 "TumblrPublishing.c" +#line 7136 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) { PublishingTumblrTumblrPublisherUploadTransaction * self; -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction); #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _publishing_rest_support_session_unref0 (self->priv->session); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction); #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _publishing_rest_support_session_unref0 (self->priv->session); +#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_upload_transaction_parent_class)->finalize (obj); -#line 7130 "TumblrPublishing.c" +#line 7150 "TumblrPublishing.c" } @@ -7168,36 +7188,36 @@ PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uplo gint _tmp1__length1 = 0; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL); -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (blog_url != NULL, NULL); #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (blog_url != NULL, NULL); +#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = session; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = publishables; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1__length1 = publishables_length1; -#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1); #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1); +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = blog_url; -#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->blog_url); -#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blog_url = _tmp3_; -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 7175 "TumblrPublishing.c" +#line 7195 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) { -#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url); -#line 7182 "TumblrPublishing.c" +#line 7202 "TumblrPublishing.c" } @@ -7211,72 +7231,72 @@ static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uplo const gchar* _tmp4_ = NULL; PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_ = NULL; PublishingRESTSupportTransaction* _tmp6_ = NULL; -#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader); -#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL); -#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1011: Create upload transaction"); #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1012: Create upload transaction"); +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader)); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = _tmp2_; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = self->priv->blog_url; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = publishing_tumblr_tumblr_publisher_upload_transaction_new (_tmp1_, _tmp3_, _tmp4_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_object_unref0 (_tmp3_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_session_unref0 (_tmp1_); -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp6_; -#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7224 "TumblrPublishing.c" +#line 7244 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass) { -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_uploader_parent_class = g_type_class_peek_parent (klass); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_uploader_finalize; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate)); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_tumblr_tumblr_publisher_uploader_real_create_transaction; -#line 7237 "TumblrPublishing.c" +#line 7257 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) { gchar* _tmp0_ = NULL; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self); #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self); +#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = g_strdup (""); -#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->blog_url = _tmp0_; -#line 7249 "TumblrPublishing.c" +#line 7269 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader* obj) { PublishingTumblrTumblrPublisherUploader * self; -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader); #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader); +#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->blog_url); -#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj); -#line 7261 "TumblrPublishing.c" +#line 7281 "TumblrPublishing.c" } @@ -7294,18 +7314,18 @@ GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) { PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type) { PublishingTumblrTumblrPublisherSession* self = NULL; -#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self = (PublishingTumblrTumblrPublisherSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_TUMBLR_ENDPOINT_URL); -#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self; -#line 7283 "TumblrPublishing.c" +#line 7303 "TumblrPublishing.c" } PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void) { -#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return publishing_tumblr_tumblr_publisher_session_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION); -#line 7290 "TumblrPublishing.c" +#line 7310 "TumblrPublishing.c" } @@ -7314,29 +7334,29 @@ static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated gboolean result = FALSE; gboolean _tmp0_ = FALSE; const gchar* _tmp1_ = NULL; -#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = self->priv->access_phase_token; -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp1_ != NULL) { -#line 7305 "TumblrPublishing.c" +#line 7325 "TumblrPublishing.c" const gchar* _tmp2_ = NULL; -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = self->priv->access_phase_token_secret; -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = _tmp2_ != NULL; -#line 7311 "TumblrPublishing.c" +#line 7331 "TumblrPublishing.c" } else { -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = FALSE; -#line 7315 "TumblrPublishing.c" +#line 7335 "TumblrPublishing.c" } -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp0_; -#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7321 "TumblrPublishing.c" +#line 7341 "TumblrPublishing.c" } @@ -7345,70 +7365,70 @@ void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_cre gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); -#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (token != NULL); -#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (secret != NULL); #line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (secret != NULL); +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = token; -#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->access_phase_token); -#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->access_phase_token = _tmp1_; #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->access_phase_token = _tmp1_; +#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = secret; -#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->access_phase_token_secret = _tmp3_; -#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 7354 "TumblrPublishing.c" +#line 7374 "TumblrPublishing.c" } void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self) { -#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); +#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->access_phase_token); -#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->access_phase_token = NULL; #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->access_phase_token = NULL; +#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->access_phase_token_secret = NULL; -#line 7369 "TumblrPublishing.c" +#line 7389 "TumblrPublishing.c" } static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) { -#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return self ? publishing_rest_support_transaction_ref (self) : NULL; -#line 7376 "TumblrPublishing.c" +#line 7396 "TumblrPublishing.c" } static void _vala_array_add23 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) { -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if ((*length) == (*size)) { -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" *array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1); -#line 7387 "TumblrPublishing.c" +#line 7407 "TumblrPublishing.c" } -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[(*length)++] = value; -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" (*array)[*length] = NULL; -#line 7393 "TumblrPublishing.c" +#line 7413 "TumblrPublishing.c" } @@ -7470,89 +7490,89 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb gchar* _tmp75_ = NULL; const gchar* _tmp76_ = NULL; PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_ = NULL; -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn)); +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = txn; -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_); -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_); -#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" http_method = _tmp2_; -#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1050: signing transaction with parameters:"); #line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1051: signing transaction with parameters:"); +#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = http_method; -#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL); -#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _tmp4_; -#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1051: %s", _tmp5_); -#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp5_); #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - signing_key = NULL; + g_debug ("TumblrPublishing.vala:1052: %s", _tmp5_); +#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (_tmp5_); #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + signing_key = NULL; +#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = self->priv->access_phase_token_secret; -#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp6_ != NULL) { -#line 7485 "TumblrPublishing.c" +#line 7505 "TumblrPublishing.c" gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; -#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1054: access phase token secret available; using" \ +#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1055: access phase token secret available; using" \ " it as signing key"); -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (self); -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = _tmp7_; -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9_ = g_strconcat (PUBLISHING_TUMBLR_API_SECRET "&", _tmp8_, NULL); -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (signing_key); -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" signing_key = _tmp9_; -#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp8_); -#line 7503 "TumblrPublishing.c" +#line 7523 "TumblrPublishing.c" } else { gchar* _tmp10_ = NULL; -#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1058: %s", "Access phase token secret not available; using API " "key as signing key"); -#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1059: %s", "Access phase token secret not available; using API " "key as signing key"); +#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = g_strdup (PUBLISHING_TUMBLR_API_SECRET "&"); -#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (signing_key); -#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" signing_key = _tmp10_; -#line 7514 "TumblrPublishing.c" +#line 7534 "TumblrPublishing.c" } -#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = txn; -#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp13_ = publishing_rest_support_transaction_get_arguments (_tmp11_, &_tmp12_); -#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" base_string_arguments = _tmp13_; -#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" base_string_arguments_length1 = _tmp12_; -#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _base_string_arguments_size_ = base_string_arguments_length1; -#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp14_ = txn; -#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp15_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION) ? ((PublishingTumblrTumblrPublisherUploadTransaction*) _tmp14_) : NULL); -#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - upload_txn = _tmp15_; #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + upload_txn = _tmp15_; +#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp16_ = upload_txn; -#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp16_ != NULL) { -#line 7536 "TumblrPublishing.c" +#line 7556 "TumblrPublishing.c" PublishingRESTSupportArgument** auth_header_args = NULL; PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_ = NULL; gint _tmp18_ = 0; @@ -7561,97 +7581,97 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb gint _auth_header_args_size_ = 0; PublishingRESTSupportArgument** _tmp20_ = NULL; gint _tmp20__length1 = 0; -#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1069: %s", "this transaction is an UploadTransaction; including Authorization head" \ +#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1070: %s", "this transaction is an UploadTransaction; including Authorization head" \ "er " "fields in signature base string"); -#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp17_ = upload_txn; -#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp19_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (_tmp17_, &_tmp18_); -#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" auth_header_args = _tmp19_; -#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" auth_header_args_length1 = _tmp18_; -#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _auth_header_args_size_ = auth_header_args_length1; -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp20_ = auth_header_args; -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp20__length1 = auth_header_args_length1; -#line 7561 "TumblrPublishing.c" +#line 7581 "TumblrPublishing.c" { PublishingRESTSupportArgument** arg_collection = NULL; gint arg_collection_length1 = 0; gint _arg_collection_size_ = 0; gint arg_it = 0; -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arg_collection = _tmp20_; -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arg_collection_length1 = _tmp20__length1; -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" for (arg_it = 0; arg_it < _tmp20__length1; arg_it = arg_it + 1) { -#line 7573 "TumblrPublishing.c" +#line 7593 "TumblrPublishing.c" PublishingRESTSupportArgument* _tmp21_ = NULL; PublishingRESTSupportArgument* arg = NULL; -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp21_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]); -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arg = _tmp21_; -#line 7580 "TumblrPublishing.c" +#line 7600 "TumblrPublishing.c" { PublishingRESTSupportArgument** _tmp22_ = NULL; gint _tmp22__length1 = 0; PublishingRESTSupportArgument* _tmp23_ = NULL; PublishingRESTSupportArgument* _tmp24_ = NULL; -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp22_ = base_string_arguments; -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp22__length1 = base_string_arguments_length1; -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp23_ = arg; -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp24_ = _publishing_rest_support_argument_ref0 (_tmp23_); -#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _vala_array_add23 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp24_); -#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_argument_unref0 (arg); -#line 7598 "TumblrPublishing.c" +#line 7618 "TumblrPublishing.c" } } } -#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 7604 "TumblrPublishing.c" +#line 7624 "TumblrPublishing.c" } -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp25_ = base_string_arguments; -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp25__length1 = base_string_arguments_length1; -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp27_ = publishing_rest_support_argument_sort (_tmp25_, _tmp25__length1, &_tmp26_); -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" sorted_args = _tmp27_; -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" sorted_args_length1 = _tmp26_; -#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _sorted_args_size_ = sorted_args_length1; -#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp28_ = g_strdup (""); -#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arguments_string = _tmp28_; -#line 7622 "TumblrPublishing.c" +#line 7642 "TumblrPublishing.c" { gint i = 0; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = 0; -#line 7627 "TumblrPublishing.c" +#line 7647 "TumblrPublishing.c" { gboolean _tmp29_ = FALSE; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp29_ = TRUE; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" while (TRUE) { -#line 7634 "TumblrPublishing.c" +#line 7654 "TumblrPublishing.c" gint _tmp31_ = 0; PublishingRESTSupportArgument** _tmp32_ = NULL; gint _tmp32__length1 = 0; @@ -7674,216 +7694,216 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb gint _tmp47_ = 0; PublishingRESTSupportArgument** _tmp48_ = NULL; gint _tmp48__length1 = 0; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!_tmp29_) { -#line 7659 "TumblrPublishing.c" +#line 7679 "TumblrPublishing.c" gint _tmp30_ = 0; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp30_ = i; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" i = _tmp30_ + 1; -#line 7665 "TumblrPublishing.c" +#line 7685 "TumblrPublishing.c" } -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp29_ = FALSE; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp31_ = i; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp32_ = sorted_args; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp32__length1 = sorted_args_length1; -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (!(_tmp31_ < _tmp32__length1)) { -#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" break; -#line 7679 "TumblrPublishing.c" +#line 7699 "TumblrPublishing.c" } -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp33_ = arguments_string; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp34_ = sorted_args; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp34__length1 = sorted_args_length1; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp35_ = i; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp36_ = _tmp34_[_tmp35_]; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp37_ = _tmp36_->key; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp38_ = g_strconcat (_tmp37_, "=", NULL); -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp39_ = _tmp38_; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp40_ = sorted_args; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp40__length1 = sorted_args_length1; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp41_ = i; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp42_ = _tmp40_[_tmp41_]; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp43_ = _tmp42_->value; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp44_ = g_strconcat (_tmp39_, _tmp43_, NULL); -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp45_ = _tmp44_; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp46_ = g_strconcat (_tmp33_, _tmp45_, NULL); -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (arguments_string); -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arguments_string = _tmp46_; -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp45_); -#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (_tmp39_); #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (_tmp39_); +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp47_ = i; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp48_ = sorted_args; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp48__length1 = sorted_args_length1; -#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp47_ < (_tmp48__length1 - 1)) { -#line 7729 "TumblrPublishing.c" +#line 7749 "TumblrPublishing.c" const gchar* _tmp49_ = NULL; gchar* _tmp50_ = NULL; -#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp49_ = arguments_string; -#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp50_ = g_strconcat (_tmp49_, "&", NULL); -#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (arguments_string); -#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" arguments_string = _tmp50_; -#line 7740 "TumblrPublishing.c" +#line 7760 "TumblrPublishing.c" } } } } -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp51_ = http_method; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp52_ = g_strconcat (_tmp51_, "&", NULL); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp53_ = _tmp52_; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp54_ = txn; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp55_ = publishing_rest_support_transaction_get_endpoint_url (_tmp54_); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp56_ = _tmp55_; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp57_ = soup_uri_encode (_tmp56_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp58_ = _tmp57_; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp59_ = g_strconcat (_tmp53_, _tmp58_, NULL); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp60_ = _tmp59_; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp61_ = g_strconcat (_tmp60_, "&", NULL); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp62_ = _tmp61_; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp63_ = arguments_string; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp64_ = soup_uri_encode (_tmp63_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp65_ = _tmp64_; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp66_ = g_strconcat (_tmp62_, _tmp65_, NULL); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp67_ = _tmp66_; -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp65_); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp62_); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp60_); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp58_); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp56_); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp53_); -#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" signature_base_string = _tmp67_; -#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp68_ = signature_base_string; -#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1094: signature base string = '%s'", _tmp68_); #line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1095: signature base string = '%s'", _tmp68_); +#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp69_ = signing_key; -#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1095: signing key = '%s'", _tmp69_); -#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1096: signing key = '%s'", _tmp69_); +#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp70_ = signing_key; -#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp71_ = signature_base_string; -#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp72_ = publishing_rest_support_hmac_sha1 (_tmp70_, _tmp71_); -#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - signature = _tmp72_; #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + signature = _tmp72_; +#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp73_ = signature; -#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1099: signature = '%s'", _tmp73_); #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1100: signature = '%s'", _tmp73_); +#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp74_ = signature; -#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp75_ = soup_uri_encode (_tmp74_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA); -#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (signature); -#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" signature = _tmp75_; -#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp76_ = signature; -#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_debug ("TumblrPublishing.vala:1102: signature after RFC encode = '%s'", _tmp76_); -#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_debug ("TumblrPublishing.vala:1103: signature after RFC encode = '%s'", _tmp76_); +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp77_ = upload_txn; -#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" if (_tmp77_ != NULL) { -#line 7829 "TumblrPublishing.c" +#line 7849 "TumblrPublishing.c" PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_ = NULL; const gchar* _tmp79_ = NULL; -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp78_ = upload_txn; -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp79_ = signature; -#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (_tmp78_, "oauth_signature", _tmp79_); -#line 7838 "TumblrPublishing.c" +#line 7858 "TumblrPublishing.c" } else { PublishingRESTSupportTransaction* _tmp80_ = NULL; const gchar* _tmp81_ = NULL; -#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp80_ = txn; -#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp81_ = signature; -#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_rest_support_transaction_add_argument (_tmp80_, "oauth_signature", _tmp81_); -#line 7848 "TumblrPublishing.c" +#line 7868 "TumblrPublishing.c" } -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (signature); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (signature_base_string); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (arguments_string); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _publishing_rest_support_transaction_unref0 (upload_txn); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (signing_key); -#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (http_method); -#line 7866 "TumblrPublishing.c" +#line 7886 "TumblrPublishing.c" } @@ -7892,31 +7912,31 @@ void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (Pu gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self)); -#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_return_if_fail (token != NULL); -#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_if_fail (secret != NULL); #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_if_fail (secret != NULL); +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = token; -#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->access_phase_token); -#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->access_phase_token = _tmp1_; #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->access_phase_token = _tmp1_; +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = secret; -#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = g_strdup (_tmp2_); -#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->access_phase_token_secret = _tmp3_; -#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated"); -#line 7899 "TumblrPublishing.c" +#line 7919 "TumblrPublishing.c" } @@ -7924,17 +7944,17 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (Publis gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->access_phase_token; -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp1_; -#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7917 "TumblrPublishing.c" +#line 7937 "TumblrPublishing.c" } @@ -7942,17 +7962,17 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret gchar* result = NULL; const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = self->priv->access_phase_token_secret; -#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = g_strdup (_tmp0_); -#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp1_; -#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7935 "TumblrPublishing.c" +#line 7955 "TumblrPublishing.c" } @@ -7971,47 +7991,47 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTum gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; -#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_get_current_time (&currtime); + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_get_current_time (&currtime); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_get_current_time (&currtime); +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = currtime; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = _tmp0_.tv_sec; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = g_strdup_printf ("%li", _tmp1_); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = _tmp2_; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = currtime; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp5_ = _tmp4_.tv_usec; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp6_ = g_strdup_printf ("%li", _tmp5_); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp7_ = _tmp6_; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp9_ = _tmp8_; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp11_ = _tmp10_; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp9_); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp7_); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp3_); -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp11_; -#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 7994 "TumblrPublishing.c" +#line 8014 "TumblrPublishing.c" } @@ -8034,7 +8054,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 8017 "TumblrPublishing.c" +#line 8037 "TumblrPublishing.c" glong _tmp4_ = 0L; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -8042,7 +8062,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 8025 "TumblrPublishing.c" +#line 8045 "TumblrPublishing.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -8054,7 +8074,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 8037 "TumblrPublishing.c" +#line 8057 "TumblrPublishing.c" } } @@ -8078,21 +8098,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 8061 "TumblrPublishing.c" +#line 8081 "TumblrPublishing.c" glong _tmp2_ = 0L; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 8067 "TumblrPublishing.c" +#line 8087 "TumblrPublishing.c" } else { #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 8071 "TumblrPublishing.c" +#line 8091 "TumblrPublishing.c" } #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 8075 "TumblrPublishing.c" +#line 8095 "TumblrPublishing.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; glong _tmp5_ = 0L; @@ -8104,7 +8124,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 8087 "TumblrPublishing.c" +#line 8107 "TumblrPublishing.c" } else { gint _tmp6_ = 0; gint _tmp7_ = 0; @@ -8114,13 +8134,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 8097 "TumblrPublishing.c" +#line 8117 "TumblrPublishing.c" } #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 8103 "TumblrPublishing.c" +#line 8123 "TumblrPublishing.c" glong _tmp9_ = 0L; glong _tmp10_ = 0L; glong _tmp11_ = 0L; @@ -8134,7 +8154,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 8117 "TumblrPublishing.c" +#line 8137 "TumblrPublishing.c" } else { glong _tmp12_ = 0L; glong _tmp13_ = 0L; @@ -8144,13 +8164,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 8127 "TumblrPublishing.c" +#line 8147 "TumblrPublishing.c" } #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 8133 "TumblrPublishing.c" +#line 8153 "TumblrPublishing.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -8159,7 +8179,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 8142 "TumblrPublishing.c" +#line 8162 "TumblrPublishing.c" } #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -8179,7 +8199,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 8162 "TumblrPublishing.c" +#line 8182 "TumblrPublishing.c" } @@ -8190,63 +8210,63 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (Publishin gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL); +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp0_ = g_get_real_time (); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp2_ = _tmp1_; -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _tmp4_ = _tmp3_; -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (_tmp2_); -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" result = _tmp4_; -#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" return result; -#line 8191 "TumblrPublishing.c" +#line 8211 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTumblrTumblrPublisherSessionClass * klass) { -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" publishing_tumblr_tumblr_publisher_session_parent_class = g_type_class_peek_parent (klass); -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_session_finalize; -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherSessionPrivate)); -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" ((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_tumblr_tumblr_publisher_session_real_is_authenticated; -#line 8204 "TumblrPublishing.c" +#line 8224 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_session_instance_init (PublishingTumblrTumblrPublisherSession * self) { -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE (self); #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self->priv->access_phase_token = NULL; + self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE (self); #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + self->priv->access_phase_token = NULL; +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->access_phase_token_secret = NULL; -#line 8215 "TumblrPublishing.c" +#line 8235 "TumblrPublishing.c" } static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession* obj) { PublishingTumblrTumblrPublisherSession * self; -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" - _g_free0 (self->priv->access_phase_token); + self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession); #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" + _g_free0 (self->priv->access_phase_token); +#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" _g_free0 (self->priv->access_phase_token_secret); -#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" +#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_tumblr_tumblr_publisher_session_parent_class)->finalize (obj); -#line 8229 "TumblrPublishing.c" +#line 8249 "TumblrPublishing.c" } @@ -8273,7 +8293,7 @@ static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumbl g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate)); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize; -#line 8256 "TumblrPublishing.c" +#line 8276 "TumblrPublishing.c" } @@ -8288,7 +8308,7 @@ static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interfa iface->start = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_start; #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_stop; -#line 8271 "TumblrPublishing.c" +#line 8291 "TumblrPublishing.c" } @@ -8322,7 +8342,7 @@ static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTu _tmp0_ = g_strdup (""); #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" self->priv->username = _tmp0_; -#line 8305 "TumblrPublishing.c" +#line 8325 "TumblrPublishing.c" } @@ -8362,7 +8382,7 @@ static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) { _g_free0 (self->priv->username); #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala" G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj); -#line 8345 "TumblrPublishing.c" +#line 8365 "TumblrPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala index bc6fcec..183bc31 100644 --- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala +++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala @@ -308,7 +308,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object { if (split_pair.length != 2) host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE( - _("“%s” isn’t a valid response to an OAuth authentication request"))); + _("“%s” isn’t a valid response to an OAuth authentication request"), response)); if (split_pair[0] == "oauth_token") oauth_token = split_pair[1]; @@ -318,7 +318,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object { if (oauth_token == null || oauth_token_secret == null) host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE( - _("“%s” isn’t a valid response to an OAuth authentication request"))); + _("“%s” isn’t a valid response to an OAuth authentication request"), response)); session.set_access_phase_credentials(oauth_token, oauth_token_secret); } @@ -602,7 +602,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object { builder = new Gtk.Builder(); builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui"); builder.connect_signals(null); - Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment; + var content = builder.get_object ("content") as Gtk.Widget; Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label; switch (mode) { @@ -628,7 +628,8 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object { password_entry.changed.connect(on_password_changed); login_button.clicked.connect(on_login_button_clicked); - align.reparent(pane_widget); + content.parent.remove (content); + pane_widget.add (content); publisher.get_host().set_dialog_default_widget(login_button); } catch (Error e) { warning(_("Could not load UI: %s"), e.message); diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c index 4e9b0a1..fb0a65b 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.c +++ b/plugins/shotwell-publishing-extras/YandexPublishing.c @@ -386,6 +386,7 @@ 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)) @@ -462,7 +463,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 466 "YandexPublishing.c" +#line 467 "YandexPublishing.c" } @@ -475,7 +476,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 479 "YandexPublishing.c" +#line 480 "YandexPublishing.c" } @@ -488,7 +489,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 492 "YandexPublishing.c" +#line 493 "YandexPublishing.c" } @@ -555,7 +556,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 559 "YandexPublishing.c" +#line 560 "YandexPublishing.c" } @@ -576,7 +577,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 580 "YandexPublishing.c" +#line 581 "YandexPublishing.c" } @@ -589,7 +590,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 593 "YandexPublishing.c" +#line 594 "YandexPublishing.c" } @@ -597,7 +598,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 601 "YandexPublishing.c" +#line 602 "YandexPublishing.c" } @@ -607,21 +608,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 611 "YandexPublishing.c" +#line 612 "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 618 "YandexPublishing.c" +#line 619 "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 625 "YandexPublishing.c" +#line 626 "YandexPublishing.c" } @@ -638,7 +639,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 642 "YandexPublishing.c" +#line 643 "YandexPublishing.c" } @@ -649,7 +650,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 653 "YandexPublishing.c" +#line 654 "YandexPublishing.c" } @@ -694,14 +695,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 698 "YandexPublishing.c" +#line 699 "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 705 "YandexPublishing.c" +#line 706 "YandexPublishing.c" } @@ -724,7 +725,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 728 "YandexPublishing.c" +#line 729 "YandexPublishing.c" PublishingRESTSupportSession* _tmp4_ = NULL; PublishingYandexSession* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -753,7 +754,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 757 "YandexPublishing.c" +#line 758 "YandexPublishing.c" } } @@ -774,14 +775,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 778 "YandexPublishing.c" +#line 779 "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 785 "YandexPublishing.c" +#line 786 "YandexPublishing.c" } @@ -800,14 +801,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 804 "YandexPublishing.c" +#line 805 "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 811 "YandexPublishing.c" +#line 812 "YandexPublishing.c" } @@ -833,14 +834,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 837 "YandexPublishing.c" +#line 838 "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 844 "YandexPublishing.c" +#line 845 "YandexPublishing.c" } @@ -856,7 +857,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 860 "YandexPublishing.c" +#line 861 "YandexPublishing.c" } @@ -867,7 +868,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 871 "YandexPublishing.c" +#line 872 "YandexPublishing.c" } @@ -886,7 +887,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 890 "YandexPublishing.c" +#line 891 "YandexPublishing.c" } @@ -904,7 +905,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 908 "YandexPublishing.c" +#line 909 "YandexPublishing.c" } @@ -917,7 +918,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 921 "YandexPublishing.c" +#line 922 "YandexPublishing.c" } @@ -926,7 +927,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 930 "YandexPublishing.c" +#line 931 "YandexPublishing.c" } @@ -938,7 +939,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 942 "YandexPublishing.c" +#line 943 "YandexPublishing.c" } @@ -965,14 +966,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 969 "YandexPublishing.c" +#line 970 "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 976 "YandexPublishing.c" +#line 977 "YandexPublishing.c" } @@ -981,7 +982,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 985 "YandexPublishing.c" +#line 986 "YandexPublishing.c" } @@ -992,7 +993,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 996 "YandexPublishing.c" +#line 997 "YandexPublishing.c" { GRegex* _tmp0_ = NULL; GRegex* _tmp1_ = NULL; @@ -1005,7 +1006,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 1009 "YandexPublishing.c" +#line 1010 "YandexPublishing.c" goto __catch39_g_regex_error; } #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1014,7 +1015,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 1018 "YandexPublishing.c" +#line 1019 "YandexPublishing.c" } #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = _tmp0_; @@ -1026,7 +1027,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 1030 "YandexPublishing.c" +#line 1031 "YandexPublishing.c" } goto __finally39; __catch39_g_regex_error: @@ -1040,7 +1041,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 1044 "YandexPublishing.c" +#line 1045 "YandexPublishing.c" } __finally39: #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1051,7 +1052,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 1055 "YandexPublishing.c" +#line 1056 "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)); @@ -1061,7 +1062,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 1065 "YandexPublishing.c" +#line 1066 "YandexPublishing.c" } @@ -1069,35 +1070,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 1073 "YandexPublishing.c" +#line 1074 "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 1080 "YandexPublishing.c" +#line 1081 "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 1087 "YandexPublishing.c" +#line 1088 "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 1094 "YandexPublishing.c" +#line 1095 "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 1101 "YandexPublishing.c" +#line 1102 "YandexPublishing.c" } @@ -1114,7 +1115,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 1118 "YandexPublishing.c" +#line 1119 "YandexPublishing.c" { WebKitNavigationPolicyDecision* n_decision = NULL; WebKitPolicyDecision* _tmp1_ = NULL; @@ -1183,7 +1184,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 1187 "YandexPublishing.c" +#line 1188 "YandexPublishing.c" gchar* access_token = NULL; GMatchInfo* _tmp17_ = NULL; gchar** _tmp18_ = NULL; @@ -1223,7 +1224,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 1227 "YandexPublishing.c" +#line 1228 "YandexPublishing.c" const gchar* _tmp26_ = NULL; WebKitPolicyDecision* _tmp27_ = NULL; #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1246,15 +1247,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 1250 "YandexPublishing.c" +#line 1251 "YandexPublishing.c" } else { #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_emit_by_name (self, "login-failed"); -#line 1254 "YandexPublishing.c" +#line 1255 "YandexPublishing.c" } #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_free0 (access_token); -#line 1258 "YandexPublishing.c" +#line 1259 "YandexPublishing.c" } #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp28_ = decision; @@ -1270,11 +1271,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 1274 "YandexPublishing.c" +#line 1275 "YandexPublishing.c" } #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" case WEBKIT_POLICY_DECISION_TYPE_RESPONSE: -#line 1278 "YandexPublishing.c" +#line 1279 "YandexPublishing.c" { WebKitPolicyDecision* _tmp29_ = NULL; #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1283,7 +1284,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 1287 "YandexPublishing.c" +#line 1288 "YandexPublishing.c" } default: { @@ -1291,14 +1292,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 1295 "YandexPublishing.c" +#line 1296 "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 1302 "YandexPublishing.c" +#line 1303 "YandexPublishing.c" } @@ -1317,14 +1318,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 1321 "YandexPublishing.c" +#line 1322 "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 1328 "YandexPublishing.c" +#line 1329 "YandexPublishing.c" } @@ -1336,7 +1337,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 1340 "YandexPublishing.c" +#line 1341 "YandexPublishing.c" } @@ -1358,21 +1359,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 1362 "YandexPublishing.c" +#line 1363 "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 1369 "YandexPublishing.c" +#line 1370 "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 1376 "YandexPublishing.c" +#line 1377 "YandexPublishing.c" } @@ -1381,7 +1382,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 1385 "YandexPublishing.c" +#line 1386 "YandexPublishing.c" } } @@ -1391,11 +1392,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 1395 "YandexPublishing.c" +#line 1396 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" dest_value->data[0].v_pointer = NULL; -#line 1399 "YandexPublishing.c" +#line 1400 "YandexPublishing.c" } } @@ -1403,37 +1404,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 1407 "YandexPublishing.c" +#line 1408 "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 1414 "YandexPublishing.c" +#line 1415 "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 1421 "YandexPublishing.c" +#line 1422 "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 1425 "YandexPublishing.c" +#line 1426 "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 1429 "YandexPublishing.c" +#line 1430 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1433 "YandexPublishing.c" +#line 1434 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1437 "YandexPublishing.c" +#line 1438 "YandexPublishing.c" } @@ -1444,25 +1445,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 1448 "YandexPublishing.c" +#line 1449 "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 1454 "YandexPublishing.c" +#line 1455 "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 1458 "YandexPublishing.c" +#line 1459 "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 1462 "YandexPublishing.c" +#line 1463 "YandexPublishing.c" } #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return NULL; -#line 1466 "YandexPublishing.c" +#line 1467 "YandexPublishing.c" } @@ -1476,7 +1477,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 1480 "YandexPublishing.c" +#line 1481 "YandexPublishing.c" } @@ -1485,7 +1486,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 1489 "YandexPublishing.c" +#line 1490 "YandexPublishing.c" } @@ -1505,17 +1506,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 1509 "YandexPublishing.c" +#line 1510 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1513 "YandexPublishing.c" +#line 1514 "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 1519 "YandexPublishing.c" +#line 1520 "YandexPublishing.c" } } @@ -1534,17 +1535,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 1538 "YandexPublishing.c" +#line 1539 "YandexPublishing.c" } else { #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" value->data[0].v_pointer = NULL; -#line 1542 "YandexPublishing.c" +#line 1543 "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 1548 "YandexPublishing.c" +#line 1549 "YandexPublishing.c" } } @@ -1554,7 +1555,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 1558 "YandexPublishing.c" +#line 1559 "YandexPublishing.c" } @@ -1569,7 +1570,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 1573 "YandexPublishing.c" +#line 1574 "YandexPublishing.c" } @@ -1585,7 +1586,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 1589 "YandexPublishing.c" +#line 1590 "YandexPublishing.c" } @@ -1610,7 +1611,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 1614 "YandexPublishing.c" +#line 1615 "YandexPublishing.c" } @@ -1623,7 +1624,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 1627 "YandexPublishing.c" +#line 1628 "YandexPublishing.c" } } @@ -1637,7 +1638,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 1641 "YandexPublishing.c" +#line 1642 "YandexPublishing.c" } @@ -1645,7 +1646,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 1649 "YandexPublishing.c" +#line 1650 "YandexPublishing.c" } @@ -1653,7 +1654,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 1657 "YandexPublishing.c" +#line 1658 "YandexPublishing.c" } @@ -1672,21 +1673,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 1676 "YandexPublishing.c" +#line 1677 "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 1683 "YandexPublishing.c" +#line 1684 "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 1690 "YandexPublishing.c" +#line 1691 "YandexPublishing.c" } @@ -1715,15 +1716,15 @@ 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 1719 "YandexPublishing.c" +#line 1720 "YandexPublishing.c" { GtkBuilder* _tmp2_ = NULL; GtkBuilder* _tmp3_ = NULL; GtkBuilder* _tmp4_ = NULL; - GtkAlignment* align = NULL; + GtkWidget* content = NULL; GtkBuilder* _tmp5_ = NULL; GObject* _tmp6_ = NULL; - GtkAlignment* _tmp7_ = NULL; + GtkWidget* _tmp7_ = NULL; GtkBuilder* _tmp8_ = NULL; GObject* _tmp9_ = NULL; GtkComboBoxText* _tmp10_ = NULL; @@ -1736,10 +1737,12 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane GtkButton* _tmp29_ = NULL; GtkButton* _tmp30_ = NULL; GtkButton* _tmp31_ = NULL; - GtkAlignment* _tmp32_ = NULL; - GtkBox* _tmp33_ = NULL; - GtkBox* _tmp34_ = NULL; - GtkAlignment* _tmp35_ = NULL; + GtkWidget* _tmp32_ = NULL; + GtkContainer* _tmp33_ = NULL; + GtkContainer* _tmp34_ = NULL; + GtkWidget* _tmp35_ = NULL; + GtkBox* _tmp36_ = NULL; + GtkWidget* _tmp37_ = NULL; #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = gtk_builder_new (); #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1752,7 +1755,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 1756 "YandexPublishing.c" +#line 1759 "YandexPublishing.c" goto __catch40_g_error; } #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1762,11 +1765,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp5_ = self->priv->builder; #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp6_ = gtk_builder_get_object (_tmp5_, "alignment"); + _tmp6_ = gtk_builder_get_object (_tmp5_, "content"); #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp6_) : NULL); + _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp6_) : NULL); #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - align = _tmp7_; + content = _tmp7_; #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp8_ = self->priv->builder; #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1777,7 +1780,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 1781 "YandexPublishing.c" +#line 1784 "YandexPublishing.c" { GeeIterator* _key_it = NULL; GeeHashMap* _tmp11_ = NULL; @@ -1804,7 +1807,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 1808 "YandexPublishing.c" +#line 1811 "YandexPublishing.c" GeeIterator* _tmp17_ = NULL; gboolean _tmp18_ = FALSE; gchar* key = NULL; @@ -1820,7 +1823,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane if (!_tmp18_) { #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" break; -#line 1824 "YandexPublishing.c" +#line 1827 "YandexPublishing.c" } #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp19_ = _key_it; @@ -1836,11 +1839,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 1840 "YandexPublishing.c" +#line 1843 "YandexPublishing.c" } #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _g_object_unref0 (_key_it); -#line 1844 "YandexPublishing.c" +#line 1847 "YandexPublishing.c" } #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp23_ = self->priv->album_list; @@ -1875,40 +1878,44 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_signal_connect_object (_tmp31_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp32_ = align; + _tmp32_ = content; #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp33_ = self->priv->box; + _tmp33_ = gtk_widget_get_parent (_tmp32_); #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget)); + _tmp34_ = _tmp33_; +#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" + _tmp35_ = content; +#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" + gtk_container_remove (_tmp34_, _tmp35_); #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp34_ = self->priv->box; + _tmp36_ = self->priv->box; #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp35_ = align; + _tmp37_ = content; #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - gtk_box_set_child_packing (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START); + 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 (align); -#line 1892 "YandexPublishing.c" + _g_object_unref0 (content); +#line 1899 "YandexPublishing.c" } goto __finally40; __catch40_g_error: { GError* e = NULL; - GError* _tmp36_ = NULL; - const gchar* _tmp37_ = NULL; + GError* _tmp38_ = NULL; + const gchar* _tmp39_ = NULL; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" e = _inner_error_; #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _inner_error_ = NULL; #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp36_ = e; + _tmp38_ = e; #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp37_ = _tmp36_->message; + _tmp39_ = _tmp38_->message; #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp37_); + 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 1912 "YandexPublishing.c" +#line 1919 "YandexPublishing.c" } __finally40: #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -1919,18 +1926,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 1923 "YandexPublishing.c" +#line 1930 "YandexPublishing.c" } #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" return self; -#line 1927 "YandexPublishing.c" +#line 1934 "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 1934 "YandexPublishing.c" +#line 1941 "YandexPublishing.c" } @@ -1939,7 +1946,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 1943 "YandexPublishing.c" +#line 1950 "YandexPublishing.c" } @@ -2040,7 +2047,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 2044 "YandexPublishing.c" +#line 2051 "YandexPublishing.c" } @@ -2055,7 +2062,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 2059 "YandexPublishing.c" +#line 2066 "YandexPublishing.c" } @@ -2070,14 +2077,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 2074 "YandexPublishing.c" +#line 2081 "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 2081 "YandexPublishing.c" +#line 2088 "YandexPublishing.c" } @@ -2097,7 +2104,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 2101 "YandexPublishing.c" +#line 2108 "YandexPublishing.c" } @@ -2139,14 +2146,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 2143 "YandexPublishing.c" +#line 2150 "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 2150 "YandexPublishing.c" +#line 2157 "YandexPublishing.c" } @@ -2188,7 +2195,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 2192 "YandexPublishing.c" +#line 2199 "YandexPublishing.c" } @@ -2201,14 +2208,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 2205 "YandexPublishing.c" +#line 2212 "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 2212 "YandexPublishing.c" +#line 2219 "YandexPublishing.c" } @@ -2218,7 +2225,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 2222 "YandexPublishing.c" +#line 2229 "YandexPublishing.c" } @@ -2238,7 +2245,7 @@ static gchar* bool_to_string (gboolean self) { gchar* result = NULL; #line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" if (self) { -#line 2242 "YandexPublishing.c" +#line 2249 "YandexPublishing.c" gchar* _tmp0_ = NULL; #line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" _tmp0_ = g_strdup ("true"); @@ -2246,7 +2253,7 @@ static gchar* bool_to_string (gboolean self) { result = _tmp0_; #line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2250 "YandexPublishing.c" +#line 2257 "YandexPublishing.c" } else { gchar* _tmp1_ = NULL; #line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" @@ -2255,7 +2262,7 @@ static gchar* bool_to_string (gboolean self) { result = _tmp1_; #line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2259 "YandexPublishing.c" +#line 2266 "YandexPublishing.c" } } @@ -2263,7 +2270,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 2267 "YandexPublishing.c" +#line 2274 "YandexPublishing.c" } @@ -2307,27 +2314,34 @@ static guint8* string_get_data (const gchar* self, int* result_length1) { if (result_length1) { #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" *result_length1 = _tmp4__length1; -#line 2311 "YandexPublishing.c" +#line 2318 "YandexPublishing.c" } #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" result = _tmp4_; #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" return result; -#line 2317 "YandexPublishing.c" +#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" } static void _g_free0_ (gpointer var) { #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" var = (g_free (var), NULL); -#line 2324 "YandexPublishing.c" +#line 2338 "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 2331 "YandexPublishing.c" +#line 2345 "YandexPublishing.c" } @@ -2369,36 +2383,38 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc gint _tmp41__length1 = 0; guint8* _tmp42_ = NULL; gint _tmp42__length1 = 0; - SoupBuffer* _tmp43_ = NULL; - SpitPublishingPublishable* _tmp44_ = NULL; - GFile* _tmp45_ = NULL; + guint8* _tmp43_ = NULL; + gint _tmp43__length1 = 0; + SoupBuffer* _tmp44_ = NULL; + SpitPublishingPublishable* _tmp45_ = NULL; GFile* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; + GFile* _tmp47_ = NULL; gchar* _tmp48_ = NULL; + gchar* _tmp49_ = NULL; SoupMessageHeaders* image_part_header = NULL; SoupBuffer* image_part_body = NULL; - SoupMessageHeaders* _tmp49_ = NULL; - SoupBuffer* _tmp50_ = NULL; + SoupMessageHeaders* _tmp50_ = NULL; + SoupBuffer* _tmp51_ = NULL; GHashTable* _result_ = NULL; - GHashFunc _tmp51_ = NULL; - GEqualFunc _tmp52_ = NULL; - GHashTable* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; + GHashFunc _tmp52_ = NULL; + GEqualFunc _tmp53_ = NULL; + GHashTable* _tmp54_ = NULL; gchar* _tmp55_ = NULL; gchar* _tmp56_ = NULL; gchar* _tmp57_ = NULL; - SoupMessage* outbound_message = NULL; gchar* _tmp58_ = NULL; + SoupMessage* outbound_message = NULL; gchar* _tmp59_ = NULL; - SoupMessage* _tmp60_ = NULL; + gchar* _tmp60_ = NULL; SoupMessage* _tmp61_ = NULL; - SoupMessageHeaders* _tmp62_ = NULL; - PublishingYandexSession* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; + SoupMessage* _tmp62_ = NULL; + SoupMessageHeaders* _tmp63_ = NULL; + PublishingYandexSession* _tmp64_ = NULL; gchar* _tmp65_ = NULL; gchar* _tmp66_ = NULL; gchar* _tmp67_ = NULL; - SoupMessageHeaders* _tmp68_ = NULL; + gchar* _tmp68_ = NULL; + SoupMessageHeaders* _tmp69_ = 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); @@ -2484,7 +2500,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 2488 "YandexPublishing.c" +#line 2504 "YandexPublishing.c" { SpitPublishingPublishable* _tmp26_ = NULL; GFile* _tmp27_ = NULL; @@ -2519,7 +2535,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 2523 "YandexPublishing.c" +#line 2539 "YandexPublishing.c" goto __catch41_g_file_error; } #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2532,7 +2548,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 2536 "YandexPublishing.c" +#line 2552 "YandexPublishing.c" } } goto __finally41; @@ -2572,7 +2588,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 2576 "YandexPublishing.c" +#line 2592 "YandexPublishing.c" } __finally41: #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2587,7 +2603,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 2591 "YandexPublishing.c" +#line 2607 "YandexPublishing.c" } #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp40_ = soup_multipart_get_length (message_parts); @@ -2600,87 +2616,91 @@ 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_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0); + _tmp43_ = (_tmp42_ != NULL) ? _vala_array_dup10 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_); #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - bindable_data = _tmp43_; + _tmp43__length1 = _tmp42__length1; +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" + _tmp44_ = soup_buffer_new_take (_tmp43_, _tmp43__length1); +#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" + bindable_data = _tmp44_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp44_ = photo; + _tmp45_ = photo; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_); + _tmp46_ = spit_publishing_publishable_get_serialized_file (_tmp45_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp46_ = _tmp45_; + _tmp47_ = _tmp46_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp47_ = g_file_get_path (_tmp46_); + _tmp48_ = g_file_get_path (_tmp47_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp48_ = _tmp47_; + _tmp49_ = _tmp48_; #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data); + soup_multipart_append_form_file (message_parts, "", _tmp49_, "image/jpeg", bindable_data); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp48_); + _g_free0 (_tmp49_); #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_object_unref0 (_tmp46_); + _g_object_unref0 (_tmp47_); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_); + soup_multipart_get_part (message_parts, image_part_num, &_tmp50_, &_tmp51_); #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - image_part_header = _tmp49_; + image_part_header = _tmp50_; #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - image_part_body = _tmp50_; + image_part_body = _tmp51_; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp51_ = g_str_hash; + _tmp52_ = g_str_hash; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp52_ = g_str_equal; + _tmp53_ = g_str_equal; #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_); + _tmp54_ = g_hash_table_new_full (_tmp52_, _tmp53_, _g_free0_, _g_free0_); #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _result_ = _tmp53_; + _result_ = _tmp54_; #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp54_ = g_strdup ("name"); + _tmp55_ = g_strdup ("name"); #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp55_ = g_strdup ("image"); + _tmp56_ = g_strdup ("image"); #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_hash_table_insert (_result_, _tmp54_, _tmp55_); + g_hash_table_insert (_result_, _tmp55_, _tmp56_); #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp56_ = g_strdup ("filename"); + _tmp57_ = g_strdup ("filename"); #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp57_ = g_strdup ("unused"); + _tmp58_ = g_strdup ("unused"); #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - g_hash_table_insert (_result_, _tmp56_, _tmp57_); + g_hash_table_insert (_result_, _tmp57_, _tmp58_); #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" - _tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction)); + _tmp59_ = 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" - _tmp59_ = _tmp58_; + _tmp60_ = _tmp59_; #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts); + _tmp61_ = soup_form_request_new_from_multipart (_tmp60_, message_parts); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp61_ = _tmp60_; + _tmp62_ = _tmp61_; #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp59_); + _g_free0 (_tmp60_); #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - outbound_message = _tmp61_; + outbound_message = _tmp62_; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp62_ = outbound_message->request_headers; + _tmp63_ = outbound_message->request_headers; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp63_ = session; + _tmp64_ = session; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_); + _tmp65_ = publishing_yandex_session_get_auth_token (_tmp64_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp65_ = _tmp64_; + _tmp66_ = _tmp65_; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_); + _tmp67_ = g_strdup_printf ("OAuth %s", _tmp66_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp67_ = _tmp66_; + _tmp68_ = _tmp67_; #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_message_headers_append (_tmp62_, "Authorization", _tmp67_); + soup_message_headers_append (_tmp63_, "Authorization", _tmp68_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp67_); + _g_free0 (_tmp68_); #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _g_free0 (_tmp65_); + _g_free0 (_tmp66_); #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - _tmp68_ = outbound_message->request_headers; + _tmp69_ = outbound_message->request_headers; #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" - soup_message_headers_append (_tmp68_, "Connection", "close"); + soup_message_headers_append (_tmp69_, "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" @@ -2695,21 +2715,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 2699 "YandexPublishing.c" +#line 2719 "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 2706 "YandexPublishing.c" +#line 2726 "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 2713 "YandexPublishing.c" +#line 2733 "YandexPublishing.c" } @@ -2770,14 +2790,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 2774 "YandexPublishing.c" +#line 2794 "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 2781 "YandexPublishing.c" +#line 2801 "YandexPublishing.c" } @@ -2795,7 +2815,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 2799 "YandexPublishing.c" +#line 2819 "YandexPublishing.c" } @@ -2812,7 +2832,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 2816 "YandexPublishing.c" +#line 2836 "YandexPublishing.c" } @@ -2824,7 +2844,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 2828 "YandexPublishing.c" +#line 2848 "YandexPublishing.c" } @@ -2847,7 +2867,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 2851 "YandexPublishing.c" +#line 2871 "YandexPublishing.c" } @@ -2863,7 +2883,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 2867 "YandexPublishing.c" +#line 2887 "YandexPublishing.c" } @@ -2882,7 +2902,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 2886 "YandexPublishing.c" +#line 2906 "YandexPublishing.c" } @@ -2896,7 +2916,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 2900 "YandexPublishing.c" +#line 2920 "YandexPublishing.c" } @@ -2909,7 +2929,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 2913 "YandexPublishing.c" +#line 2933 "YandexPublishing.c" { xmlNode* c = NULL; xmlNode* _tmp0_ = NULL; @@ -2920,14 +2940,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 2924 "YandexPublishing.c" +#line 2944 "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 2931 "YandexPublishing.c" +#line 2951 "YandexPublishing.c" xmlNode* _tmp5_ = NULL; xmlNode* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; @@ -2938,7 +2958,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 2942 "YandexPublishing.c" +#line 2962 "YandexPublishing.c" xmlNode* _tmp3_ = NULL; xmlNode* _tmp4_ = NULL; #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2947,7 +2967,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 2951 "YandexPublishing.c" +#line 2971 "YandexPublishing.c" } #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp2_ = FALSE; @@ -2957,7 +2977,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 2961 "YandexPublishing.c" +#line 2981 "YandexPublishing.c" } #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = c; @@ -2965,7 +2985,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 2969 "YandexPublishing.c" +#line 2989 "YandexPublishing.c" xmlNode* _tmp8_ = NULL; gchar* _tmp9_ = NULL; #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -2976,7 +2996,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 2980 "YandexPublishing.c" +#line 3000 "YandexPublishing.c" } #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp11_ = c; @@ -2984,7 +3004,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 2988 "YandexPublishing.c" +#line 3008 "YandexPublishing.c" xmlNode* _tmp13_ = NULL; gchar* _tmp14_ = NULL; gchar* _tmp15_ = NULL; @@ -2998,15 +3018,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 3002 "YandexPublishing.c" +#line 3022 "YandexPublishing.c" } else { #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp10_ = FALSE; -#line 3006 "YandexPublishing.c" +#line 3026 "YandexPublishing.c" } #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp10_) { -#line 3010 "YandexPublishing.c" +#line 3030 "YandexPublishing.c" xmlNode* _tmp16_ = NULL; gchar* _tmp17_ = NULL; #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3017,27 +3037,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 3021 "YandexPublishing.c" +#line 3041 "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 3027 "YandexPublishing.c" +#line 3047 "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 3033 "YandexPublishing.c" +#line 3053 "YandexPublishing.c" } else { #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp18_ = FALSE; -#line 3037 "YandexPublishing.c" +#line 3057 "YandexPublishing.c" } #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" if (_tmp18_) { -#line 3041 "YandexPublishing.c" +#line 3061 "YandexPublishing.c" const gchar* _tmp21_ = NULL; const gchar* _tmp22_ = NULL; GeeHashMap* _tmp23_ = NULL; @@ -3067,7 +3087,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 3071 "YandexPublishing.c" +#line 3091 "YandexPublishing.c" } } } @@ -3076,7 +3096,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 3080 "YandexPublishing.c" +#line 3100 "YandexPublishing.c" } @@ -3085,7 +3105,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 3089 "YandexPublishing.c" +#line 3109 "YandexPublishing.c" } @@ -3116,7 +3136,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 3120 "YandexPublishing.c" +#line 3140 "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); @@ -3124,7 +3144,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 3128 "YandexPublishing.c" +#line 3148 "YandexPublishing.c" } } #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3147,7 +3167,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 3151 "YandexPublishing.c" +#line 3171 "YandexPublishing.c" } else { #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); @@ -3157,12 +3177,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 3161 "YandexPublishing.c" +#line 3181 "YandexPublishing.c" } } #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); -#line 3166 "YandexPublishing.c" +#line 3186 "YandexPublishing.c" } @@ -3192,7 +3212,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 3196 "YandexPublishing.c" +#line 3216 "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); @@ -3200,7 +3220,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 3204 "YandexPublishing.c" +#line 3224 "YandexPublishing.c" } } #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3209,7 +3229,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 3213 "YandexPublishing.c" +#line 3233 "YandexPublishing.c" { xmlNode* e = NULL; xmlNode* _tmp4_ = NULL; @@ -3220,21 +3240,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 3224 "YandexPublishing.c" +#line 3244 "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 3231 "YandexPublishing.c" +#line 3251 "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 3238 "YandexPublishing.c" +#line 3258 "YandexPublishing.c" xmlNode* _tmp7_ = NULL; xmlNode* _tmp8_ = NULL; #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3243,7 +3263,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 3247 "YandexPublishing.c" +#line 3267 "YandexPublishing.c" } #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp6_ = FALSE; @@ -3253,7 +3273,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 3257 "YandexPublishing.c" +#line 3277 "YandexPublishing.c" } #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp10_ = e; @@ -3263,7 +3283,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 3267 "YandexPublishing.c" +#line 3287 "YandexPublishing.c" } #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = e; @@ -3279,7 +3299,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 3283 "YandexPublishing.c" +#line 3303 "YandexPublishing.c" } else { #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_xml_document_unref0 (doc); @@ -3289,7 +3309,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 3293 "YandexPublishing.c" +#line 3313 "YandexPublishing.c" } } } @@ -3297,21 +3317,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 3301 "YandexPublishing.c" +#line 3321 "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 3308 "YandexPublishing.c" +#line 3328 "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 3315 "YandexPublishing.c" +#line 3335 "YandexPublishing.c" } @@ -3344,7 +3364,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 3348 "YandexPublishing.c" +#line 3368 "YandexPublishing.c" } @@ -3376,7 +3396,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 3380 "YandexPublishing.c" +#line 3400 "YandexPublishing.c" { PublishingRESTSupportTransaction* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -3395,7 +3415,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 3399 "YandexPublishing.c" +#line 3419 "YandexPublishing.c" goto __catch42_spit_publishing_publishing_error; } #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3404,7 +3424,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 3408 "YandexPublishing.c" +#line 3428 "YandexPublishing.c" } } goto __finally42; @@ -3427,7 +3447,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 3431 "YandexPublishing.c" +#line 3451 "YandexPublishing.c" } __finally42: #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3438,7 +3458,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 3442 "YandexPublishing.c" +#line 3462 "YandexPublishing.c" } #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp9_ = self->priv->album_list; @@ -3458,7 +3478,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 3462 "YandexPublishing.c" +#line 3482 "YandexPublishing.c" } else { SpitPublishingPluginHost* _tmp15_ = NULL; GError* _tmp16_ = NULL; @@ -3473,7 +3493,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 3477 "YandexPublishing.c" +#line 3497 "YandexPublishing.c" } } @@ -3519,7 +3539,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 3522 "YandexPublishing.c" +#line 3542 "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_); @@ -3527,7 +3547,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 3530 "YandexPublishing.c" +#line 3550 "YandexPublishing.c" goto __catch43_spit_publishing_publishing_error; } #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3542,7 +3562,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 3545 "YandexPublishing.c" +#line 3565 "YandexPublishing.c" } } goto __finally43; @@ -3563,7 +3583,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 3566 "YandexPublishing.c" +#line 3586 "YandexPublishing.c" } __finally43: #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -3580,7 +3600,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 3583 "YandexPublishing.c" +#line 3603 "YandexPublishing.c" } #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); @@ -3588,21 +3608,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 3591 "YandexPublishing.c" +#line 3611 "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 3598 "YandexPublishing.c" +#line 3618 "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 3605 "YandexPublishing.c" +#line 3625 "YandexPublishing.c" } @@ -3634,7 +3654,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 3637 "YandexPublishing.c" +#line 3657 "YandexPublishing.c" SpitPublishingPluginHost* _tmp5_ = NULL; GError* _tmp6_ = NULL; GError* _tmp7_ = NULL; @@ -3648,7 +3668,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 3651 "YandexPublishing.c" +#line 3671 "YandexPublishing.c" } #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp8_ = self->priv->host; @@ -3658,7 +3678,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 3661 "YandexPublishing.c" +#line 3681 "YandexPublishing.c" } @@ -3691,7 +3711,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 3694 "YandexPublishing.c" +#line 3714 "YandexPublishing.c" } @@ -3726,14 +3746,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 3728 "YandexPublishing.c" +#line 3748 "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 3735 "YandexPublishing.c" +#line 3755 "YandexPublishing.c" } @@ -3824,7 +3844,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 3826 "YandexPublishing.c" +#line 3846 "YandexPublishing.c" } @@ -3839,7 +3859,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 3841 "YandexPublishing.c" +#line 3861 "YandexPublishing.c" } #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = self->priv->session; @@ -3851,7 +3871,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 3853 "YandexPublishing.c" +#line 3873 "YandexPublishing.c" } @@ -3907,11 +3927,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 3909 "YandexPublishing.c" +#line 3929 "YandexPublishing.c" } else { #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_start_upload (self); -#line 3913 "YandexPublishing.c" +#line 3933 "YandexPublishing.c" } } @@ -3919,14 +3939,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 3921 "YandexPublishing.c" +#line 3941 "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 3928 "YandexPublishing.c" +#line 3948 "YandexPublishing.c" } @@ -3961,21 +3981,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 3963 "YandexPublishing.c" +#line 3983 "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 3970 "YandexPublishing.c" +#line 3990 "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 3977 "YandexPublishing.c" +#line 3997 "YandexPublishing.c" } @@ -4020,7 +4040,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 4022 "YandexPublishing.c" +#line 4042 "YandexPublishing.c" { PublishingRESTSupportTransaction* _tmp7_ = NULL; gchar* _tmp8_ = NULL; @@ -4039,7 +4059,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 4041 "YandexPublishing.c" +#line 4061 "YandexPublishing.c" goto __catch44_spit_publishing_publishing_error; } #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4048,7 +4068,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 4050 "YandexPublishing.c" +#line 4070 "YandexPublishing.c" } } goto __finally44; @@ -4069,7 +4089,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 4071 "YandexPublishing.c" +#line 4091 "YandexPublishing.c" } __finally44: #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4080,7 +4100,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 4082 "YandexPublishing.c" +#line 4102 "YandexPublishing.c" } #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = self->priv->options; @@ -4102,7 +4122,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 4104 "YandexPublishing.c" +#line 4124 "YandexPublishing.c" } @@ -4138,7 +4158,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 4140 "YandexPublishing.c" +#line 4160 "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_); @@ -4146,7 +4166,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 4148 "YandexPublishing.c" +#line 4168 "YandexPublishing.c" goto __catch45_spit_publishing_publishing_error; } #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4157,7 +4177,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 4159 "YandexPublishing.c" +#line 4179 "YandexPublishing.c" } } goto __finally45; @@ -4178,7 +4198,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 4180 "YandexPublishing.c" +#line 4200 "YandexPublishing.c" } __finally45: #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4191,25 +4211,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 4193 "YandexPublishing.c" +#line 4213 "YandexPublishing.c" } #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); -#line 4197 "YandexPublishing.c" +#line 4217 "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 4204 "YandexPublishing.c" +#line 4224 "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 4211 "YandexPublishing.c" +#line 4231 "YandexPublishing.c" } @@ -4242,7 +4262,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 4244 "YandexPublishing.c" +#line 4264 "YandexPublishing.c" } @@ -4281,7 +4301,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 4283 "YandexPublishing.c" +#line 4303 "YandexPublishing.c" { PublishingRESTSupportXmlDocument* doc = NULL; PublishingRESTSupportTransaction* _tmp7_ = NULL; @@ -4310,7 +4330,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 4312 "YandexPublishing.c" +#line 4332 "YandexPublishing.c" goto __catch46_spit_publishing_publishing_error; } #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4319,7 +4339,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 4321 "YandexPublishing.c" +#line 4341 "YandexPublishing.c" } #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp12_ = doc; @@ -4327,7 +4347,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 4329 "YandexPublishing.c" +#line 4349 "YandexPublishing.c" { xmlNode* work = NULL; xmlNode* _tmp14_ = NULL; @@ -4338,20 +4358,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 4340 "YandexPublishing.c" +#line 4360 "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 4347 "YandexPublishing.c" +#line 4367 "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 4353 "YandexPublishing.c" +#line 4373 "YandexPublishing.c" xmlNode* _tmp17_ = NULL; xmlNode* _tmp18_ = NULL; #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4360,7 +4380,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 4362 "YandexPublishing.c" +#line 4382 "YandexPublishing.c" } #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp16_ = FALSE; @@ -4370,7 +4390,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 4372 "YandexPublishing.c" +#line 4392 "YandexPublishing.c" } #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp20_ = work; @@ -4380,7 +4400,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 4382 "YandexPublishing.c" +#line 4402 "YandexPublishing.c" } { xmlNode* c = NULL; @@ -4392,14 +4412,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 4394 "YandexPublishing.c" +#line 4414 "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 4401 "YandexPublishing.c" +#line 4421 "YandexPublishing.c" xmlNode* _tmp27_ = NULL; xmlNode* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; @@ -4409,7 +4429,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 4411 "YandexPublishing.c" +#line 4431 "YandexPublishing.c" xmlNode* _tmp25_ = NULL; xmlNode* _tmp26_ = NULL; #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4418,7 +4438,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 4420 "YandexPublishing.c" +#line 4440 "YandexPublishing.c" } #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp24_ = FALSE; @@ -4428,7 +4448,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 4430 "YandexPublishing.c" +#line 4450 "YandexPublishing.c" } #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp28_ = c; @@ -4438,7 +4458,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 4440 "YandexPublishing.c" +#line 4460 "YandexPublishing.c" } #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp30_ = c; @@ -4452,7 +4472,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 4454 "YandexPublishing.c" +#line 4474 "YandexPublishing.c" gchar* url = NULL; xmlNode* _tmp34_ = NULL; gchar* _tmp35_ = NULL; @@ -4484,7 +4504,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 4486 "YandexPublishing.c" +#line 4506 "YandexPublishing.c" } } } @@ -4494,7 +4514,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 4496 "YandexPublishing.c" +#line 4516 "YandexPublishing.c" } goto __finally46; __catch46_spit_publishing_publishing_error: @@ -4514,7 +4534,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 4516 "YandexPublishing.c" +#line 4536 "YandexPublishing.c" } __finally46: #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4525,7 +4545,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 4527 "YandexPublishing.c" +#line 4547 "YandexPublishing.c" } } @@ -4557,7 +4577,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 4559 "YandexPublishing.c" +#line 4579 "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_); @@ -4565,7 +4585,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 4567 "YandexPublishing.c" +#line 4587 "YandexPublishing.c" goto __catch47_spit_publishing_publishing_error; } #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4576,7 +4596,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 4578 "YandexPublishing.c" +#line 4598 "YandexPublishing.c" } } goto __finally47; @@ -4597,7 +4617,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 4599 "YandexPublishing.c" +#line 4619 "YandexPublishing.c" } __finally47: #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" @@ -4610,11 +4630,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 4612 "YandexPublishing.c" +#line 4632 "YandexPublishing.c" } #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _publishing_rest_support_transaction_unref0 (t); -#line 4616 "YandexPublishing.c" +#line 4636 "YandexPublishing.c" } @@ -4643,7 +4663,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 4645 "YandexPublishing.c" +#line 4665 "YandexPublishing.c" } @@ -4652,21 +4672,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 4654 "YandexPublishing.c" +#line 4674 "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 4661 "YandexPublishing.c" +#line 4681 "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 4668 "YandexPublishing.c" +#line 4688 "YandexPublishing.c" } @@ -4711,14 +4731,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 4713 "YandexPublishing.c" +#line 4733 "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 4720 "YandexPublishing.c" +#line 4740 "YandexPublishing.c" } @@ -4733,7 +4753,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 4735 "YandexPublishing.c" +#line 4755 "YandexPublishing.c" } @@ -4750,7 +4770,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 4752 "YandexPublishing.c" +#line 4772 "YandexPublishing.c" } #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" _tmp1_ = self->priv->host; @@ -4759,7 +4779,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 4760 "YandexPublishing.c" +#line 4780 "YandexPublishing.c" } #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction."); @@ -4769,7 +4789,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 4770 "YandexPublishing.c" +#line 4790 "YandexPublishing.c" PublishingYandexSession* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -4793,11 +4813,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 4794 "YandexPublishing.c" +#line 4814 "YandexPublishing.c" } else { #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala" publishing_yandex_yandex_publisher_show_welcome_page (self); -#line 4798 "YandexPublishing.c" +#line 4818 "YandexPublishing.c" } } @@ -4812,7 +4832,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 4813 "YandexPublishing.c" +#line 4833 "YandexPublishing.c" } @@ -4823,7 +4843,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 4824 "YandexPublishing.c" +#line 4844 "YandexPublishing.c" } @@ -4838,7 +4858,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 4839 "YandexPublishing.c" +#line 4859 "YandexPublishing.c" } @@ -4859,7 +4879,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 4860 "YandexPublishing.c" +#line 4880 "YandexPublishing.c" } @@ -4887,7 +4907,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 4888 "YandexPublishing.c" +#line 4908 "YandexPublishing.c" } diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala index 2eb78f3..dbfa3de 100644 --- a/plugins/shotwell-publishing-extras/YandexPublishing.vala +++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala @@ -194,7 +194,7 @@ internal class PublishingOptionsPane: Spit.Publishing.DialogPane, GLib.Object { builder.add_from_resource (Resources.RESOURCE_PATH + "/yandex_publish_model.ui"); builder.connect_signals(null); - Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment; + var content = builder.get_object ("content") as Gtk.Widget; album_list = builder.get_object ("album_list") as Gtk.ComboBoxText; foreach (string key in list.keys) @@ -208,8 +208,8 @@ internal class PublishingOptionsPane: Spit.Publishing.DialogPane, GLib.Object { publish_button.clicked.connect(on_publish_clicked); logout_button.clicked.connect(on_logout_clicked); - align.reparent(box); - box.set_child_packing(align, true, true, 0, Gtk.PackType.START); + content.parent.remove (content); + box.pack_start (content, true, true, 0); } catch (Error e) { warning("Could not load UI: %s", e.message); } @@ -275,7 +275,7 @@ private class UploadTransaction: Transaction { int image_part_num = message_parts.get_length(); - Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, photo_data.data[0:data_length]); + var bindable_data = new Soup.Buffer.take (photo_data.data); 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/rajce_authentication_pane.ui b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui index 496304f..439a754 100644 --- a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui +++ b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui @@ -1,148 +1,138 @@ + - + False - + True False - 0.5 - 0.5 + 30 + 30 + True + 8 - + True False - 30 - 30 True - 8 + True + label + True + 0 + + + False + True + 0 + + + + + True + False + 2 + 2 + 8 + 2 + + + True + False + _Email address + True + username_entry + 0 + + - + True False - True - True + _Password + True + password_entry 0 - label - True - False - True - 0 + 1 + 2 - + True - False - 2 - 2 - 8 - 2 - - - True - False - 0 - _Email address - True - username_entry - - - - - True - False - 0 - _Password - True - password_entry - - - 1 - 2 - - - - - True - True - ● - - - 1 - 2 - - - - - True - True - False - ● - True - - - 1 - 2 - 1 - 2 - - + True + ● - True - True - 1 + 1 + 2 - - _Remember - False + True True - False - False - True - 0 - True + False + ● - True - True - 2 + 1 + 2 + 1 + 2 + + + True + True + 1 + + + + + _Remember + False + True + True + False + True + 0 + True + + + True + True + 2 + + + + + True + False - + + Log in + False True - False - - - Log in - False - True - True - True - False - - - False - False - 0 - - + True + True - True - True - 3 + False + False + 0 + + True + True + 3 + diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui index 98f03b8..9752a7c 100644 --- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui +++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui @@ -1,130 +1,121 @@ + - + False - + True False - 0.5 - 0.5 + 30 + 30 + True + 8 - + True False - 30 - 30 True - 8 + True + label + True + 0 + + + False + True + 0 + + + + + True + False + 2 + 2 + 8 + 2 + + + True + False + _Email address + True + username_entry + 0 + + - + True False - True - True + _Password + True + password_entry 0 - label - True - False - True - 0 + 1 + 2 - + True - False - 2 - 2 - 8 - 2 - - - True - False - 0 - _Email address - True - username_entry - - - - - True - False - 0 - _Password - True - password_entry - - - 1 - 2 - - - - - True - True - ● - - - 1 - 2 - - - - - True - True - False - ● - True - - - 1 - 2 - 1 - 2 - - + True + ● - True - True - 1 + 1 + 2 - + True - False - - - Log in - False - True - True - True - False - - - False - False - 0 - - + True + False + ● + + + 1 + 2 + 1 + 2 + + + + + True + True + 1 + + + + + True + False + + + Log in + False + True + True + True - True - True - 3 + False + False + 0 + + True + True + 3 + diff --git a/plugins/shotwell-publishing-extras/yandex_publish_model.ui b/plugins/shotwell-publishing-extras/yandex_publish_model.ui index 175bafd..1d9cc22 100644 --- a/plugins/shotwell-publishing-extras/yandex_publish_model.ui +++ b/plugins/shotwell-publishing-extras/yandex_publish_model.ui @@ -1,175 +1,179 @@ + - - + + + + + + + + + Public + + + Friends + + + Private + + + + + + + + + + False - + True - 0.30000001192092896 - 0.10000000149011612 - 0.10000000149011612 + False - + True + False + 2 + 2 - + True - 2 - 2 - - - True - 0.30000001192092896 - _Albums (or write new): - True - album_list - - - 1 - 2 - - - - - True - 0 - 6 - Access _type: - True - access_type_list - - - - - True - liststore1 - 0 - 0 - - - 1 - 2 - 1 - - - - - True - liststore2 - 0 - 0 - - - 1 - 2 - 1 - 2 - 1 - - + False + _Albums (or write new): + True + album_list + 0.30000001192092896 - 0 + 1 + 2 - + + True + False + 6 + Access _type: + True + access_type_list + 0 + - - Disable _comments + True - True - False - True - 0.30000001192092896 - True + False + 0 - 2 - 2 + 1 + 2 + 1 - - _Forbid downloading original photo + + True + False + 0 + + + 1 + 2 + 1 + 2 + 1 + + + + + True + True + 0 + + + + + + + + Disable _comments + True + True + False + True + 0.30000001192092896 + True + + + True + True + 2 + 2 + + + + + _Forbid downloading original photo + True + True + False + True + 0.30000001192092896 + True + + + True + True + 3 + + + + + True + False + 2 + spread + + + _Logout True True - False + True True - 0.30000001192092896 - True - 3 + False + False + 0 - + + _Publish True - 2 - spread - - - _Logout - True - True - True - True - - - False - False - 0 - - - - - _Publish - True - True - True - True - - - False - False - 1 - - + True + True + True - 12 - 4 + False + False + 1 + + True + True + 12 + 4 + - - - - - - - - Public - - - Friends - - - Private - - - - - - - - - -- cgit v1.2.3