summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-11-25 04:11:58 +0100
commitccff5442184e84d511c2bd25ed3da53e4336a272 (patch)
tree8402a0ba68852e0aec5841ed4519ccfe88352223 /plugins
parenta1e1833f48ed618273dab9198b547148a89832a7 (diff)
parent4a3f1fdfe1eb3743564adcee35d5513224339260 (diff)
Merge tag 'upstream/0.25.1'
Upstream version 0.25.1
Diffstat (limited to 'plugins')
-rw-r--r--plugins/common/BuilderPane.c632
-rw-r--r--plugins/common/BuilderPane.vala60
-rw-r--r--plugins/common/RESTSupport.c1223
-rw-r--r--plugins/common/RESTSupport.vala18
-rw-r--r--plugins/common/WebAuthenticationPane.c238
-rw-r--r--plugins/common/WebAuthenticationPane.vala8
-rw-r--r--plugins/shotwell-plugin-common.h34
-rw-r--r--plugins/shotwell-plugin-common.vapi13
-rw-r--r--plugins/shotwell-publishing-extras/RajcePublishing.c3316
-rw-r--r--plugins/shotwell-publishing-extras/RajcePublishing.vala5
-rw-r--r--plugins/shotwell-publishing-extras/TumblrPublishing.c2960
-rw-r--r--plugins/shotwell-publishing-extras/TumblrPublishing.vala9
-rw-r--r--plugins/shotwell-publishing-extras/YandexPublishing.c722
-rw-r--r--plugins/shotwell-publishing-extras/YandexPublishing.vala8
-rw-r--r--plugins/shotwell-publishing-extras/rajce_authentication_pane.ui202
-rw-r--r--plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui181
-rw-r--r--plugins/shotwell-publishing-extras/yandex_publish_model.ui272
-rw-r--r--plugins/shotwell-publishing/FacebookPublishing.c2
-rw-r--r--plugins/shotwell-publishing/FacebookPublishing.vala20
-rw-r--r--plugins/shotwell-publishing/FlickrPublishing.c12
-rw-r--r--plugins/shotwell-publishing/PicasaPublishing.c1146
-rw-r--r--plugins/shotwell-publishing/PicasaPublishing.vala4
-rw-r--r--plugins/shotwell-publishing/PiwigoPublishing.c10909
-rw-r--r--plugins/shotwell-publishing/PiwigoPublishing.vala440
-rw-r--r--plugins/shotwell-publishing/YouTubePublishing.c917
-rw-r--r--plugins/shotwell-publishing/YouTubePublishing.vala5
-rw-r--r--plugins/shotwell-publishing/piwigo_authentication_pane.ui257
-rw-r--r--plugins/shotwell-publishing/piwigo_publishing_options_pane.ui469
28 files changed, 12587 insertions, 11495 deletions
diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
new file mode 100644
index 0000000..a278bed
--- /dev/null
+++ b/plugins/common/BuilderPane.c
@@ -0,0 +1,632 @@
+/* BuilderPane.c generated by valac 0.34.2, the Vala compiler
+ * generated from BuilderPane.vala, do not modify */
+
+/* Copyright 2016 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#define SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE (shotwell_plugins_common_builder_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+
+typedef struct _ShotwellPluginsCommonBuilderPane ShotwellPluginsCommonBuilderPane;
+typedef struct _ShotwellPluginsCommonBuilderPaneClass ShotwellPluginsCommonBuilderPaneClass;
+typedef struct _ShotwellPluginsCommonBuilderPanePrivate ShotwellPluginsCommonBuilderPanePrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+struct _ShotwellPluginsCommonBuilderPane {
+ GObject parent_instance;
+ ShotwellPluginsCommonBuilderPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonBuilderPaneClass {
+ GObjectClass parent_class;
+ GtkWidget* (*get_default_widget) (ShotwellPluginsCommonBuilderPane* self);
+ void (*on_pane_installed) (ShotwellPluginsCommonBuilderPane* self);
+ void (*on_pane_uninstalled) (ShotwellPluginsCommonBuilderPane* self);
+};
+
+struct _ShotwellPluginsCommonBuilderPanePrivate {
+ SpitPublishingDialogPaneGeometryOptions _preferred_geometry;
+ gchar* _resource_path;
+ gboolean _connect_signals;
+ gchar* _default_id;
+ GtkBuilder* builder;
+ GtkWidget* content;
+};
+
+
+static gpointer shotwell_plugins_common_builder_pane_parent_class = NULL;
+static SpitPublishingDialogPaneIface* shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+
+GType shotwell_plugins_common_builder_pane_get_type (void) G_GNUC_CONST;
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPanePrivate))
+enum {
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DUMMY_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS,
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID
+};
+static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base);
+gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self);
+gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self);
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self);
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base);
+GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self);
+GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self);
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self);
+gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self);
+static void shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
+static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
+ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type);
+static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value);
+static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
+static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value);
+static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
+static void shotwell_plugins_common_builder_pane_finalize (GObject* obj);
+static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return self ? g_object_ref (self) : NULL;
+#line 93 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base) {
+ ShotwellPluginsCommonBuilderPane * self;
+ gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+ gchar* _tmp2_ = NULL;
+ gchar* _tmp3_ = NULL;
+ gchar* _tmp4_ = NULL;
+ gchar* _tmp5_ = NULL;
+ GtkBuilder* _tmp6_ = NULL;
+ gboolean _tmp7_ = FALSE;
+ GtkBuilder* _tmp9_ = NULL;
+ GObject* _tmp10_ = NULL;
+ GtkWidget* _tmp11_ = NULL;
+ GtkWidget* _tmp12_ = NULL;
+ GtkContainer* _tmp13_ = NULL;
+ GtkContainer* _tmp14_ = NULL;
+#line 22 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 23 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ G_OBJECT_CLASS (shotwell_plugins_common_builder_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = shotwell_plugins_common_builder_pane_get_resource_path (self);
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = _tmp0_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp2_ = _tmp1_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_debug ("BuilderPane.vala:25: Adding new builder from path %s", _tmp2_);
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_free0 (_tmp2_);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp3_ = shotwell_plugins_common_builder_pane_get_resource_path (self);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp4_ = _tmp3_;
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp5_ = _tmp4_;
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp6_ = gtk_builder_new_from_resource (_tmp5_);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_object_unref0 (self->priv->builder);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->builder = _tmp6_;
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_free0 (_tmp5_);
+#line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp7_ = self->priv->_connect_signals;
+#line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ if (_tmp7_) {
+#line 145 "BuilderPane.c"
+ GtkBuilder* _tmp8_ = NULL;
+#line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp8_ = self->priv->builder;
+#line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ gtk_builder_connect_signals (_tmp8_, NULL);
+#line 151 "BuilderPane.c"
+ }
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp9_ = self->priv->builder;
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp10_ = gtk_builder_get_object (_tmp9_, "content");
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp10_) : NULL);
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_object_unref0 (self->priv->content);
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->content = _tmp11_;
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp12_ = self->priv->content;
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp13_ = gtk_widget_get_parent (_tmp12_);
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp14_ = _tmp13_;
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ if (_tmp14_ != NULL) {
+#line 171 "BuilderPane.c"
+ GtkWidget* _tmp15_ = NULL;
+ GtkContainer* _tmp16_ = NULL;
+ GtkContainer* _tmp17_ = NULL;
+ GtkWidget* _tmp18_ = NULL;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp15_ = self->priv->content;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp16_ = gtk_widget_get_parent (_tmp15_);
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp17_ = _tmp16_;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp18_ = self->priv->content;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ gtk_container_remove (_tmp17_, _tmp18_);
+#line 186 "BuilderPane.c"
+ }
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+ ShotwellPluginsCommonBuilderPane * self;
+ SpitPublishingDialogPaneGeometryOptions result = 0;
+ SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 40 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = self->priv->_preferred_geometry;
+#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp0_;
+#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 203 "BuilderPane.c"
+}
+
+
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base) {
+ ShotwellPluginsCommonBuilderPane * self;
+ GtkWidget* result = NULL;
+ GtkWidget* _tmp0_ = NULL;
+ GtkWidget* _tmp1_ = NULL;
+#line 44 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = self->priv->content;
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp1_;
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 222 "BuilderPane.c"
+}
+
+
+GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self) {
+ GtkBuilder* result = NULL;
+ GtkBuilder* _tmp0_ = NULL;
+ GtkBuilder* _tmp1_ = NULL;
+#line 48 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = self->priv->builder;
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp1_;
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 240 "BuilderPane.c"
+}
+
+
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+ GtkWidget* result = NULL;
+ GtkBuilder* _tmp0_ = NULL;
+ GtkBuilder* _tmp1_ = NULL;
+ gchar* _tmp2_ = NULL;
+ gchar* _tmp3_ = NULL;
+ gchar* _tmp4_ = NULL;
+ GObject* _tmp5_ = NULL;
+ GtkWidget* _tmp6_ = NULL;
+ GtkWidget* _tmp7_ = NULL;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = shotwell_plugins_common_builder_pane_get_builder (self);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = _tmp0_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp2_ = shotwell_plugins_common_builder_pane_get_default_id (self);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp3_ = _tmp2_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp4_ = _tmp3_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp5_ = gtk_builder_get_object (_tmp1_, _tmp4_);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp7_ = _tmp6_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_free0 (_tmp4_);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_object_unref0 (_tmp1_);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp7_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 278 "BuilderPane.c"
+}
+
+
+GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+#line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->get_default_widget (self);
+#line 287 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+}
+
+
+void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+#line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_installed (self);
+#line 300 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+}
+
+
+void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+#line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_uninstalled (self);
+#line 313 "BuilderPane.c"
+}
+
+
+ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type) {
+ ShotwellPluginsCommonBuilderPane * self = NULL;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self = (ShotwellPluginsCommonBuilderPane*) g_object_new (object_type, NULL);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return self;
+#line 323 "BuilderPane.c"
+}
+
+
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self) {
+ SpitPublishingDialogPaneGeometryOptions result;
+ SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), 0);
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = self->priv->_preferred_geometry;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 338 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+ SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = value;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->_preferred_geometry = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_notify ((GObject *) self, "preferred-geometry");
+#line 352 "BuilderPane.c"
+}
+
+
+gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self) {
+ gchar* result;
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = self->priv->_resource_path;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 370 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = value;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_free0 (self->priv->_resource_path);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->_resource_path = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_notify ((GObject *) self, "resource-path");
+#line 389 "BuilderPane.c"
+}
+
+
+gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self) {
+ gboolean result;
+ gboolean _tmp0_ = FALSE;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), FALSE);
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = self->priv->_connect_signals;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp0_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 404 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value) {
+ gboolean _tmp0_ = FALSE;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = value;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->_connect_signals = _tmp0_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_notify ((GObject *) self, "connect-signals");
+#line 418 "BuilderPane.c"
+}
+
+
+gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self) {
+ gchar* result;
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = self->priv->_default_id;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ result = _tmp1_;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ return result;
+#line 436 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = value;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_free0 (self->priv->_default_id);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->_default_id = _tmp1_;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_notify ((GObject *) self, "default-id");
+#line 455 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsCommonBuilderPaneClass * klass) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ shotwell_plugins_common_builder_pane_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonBuilderPanePrivate));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ ((GObjectClass *) klass)->constructed = shotwell_plugins_common_builder_pane_real_constructed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ ((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = shotwell_plugins_common_builder_pane_real_get_default_widget;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = shotwell_plugins_common_builder_pane_real_on_pane_installed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = shotwell_plugins_common_builder_pane_real_on_pane_uninstalled;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_builder_pane_get_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ G_OBJECT_CLASS (klass)->set_property = _vala_shotwell_plugins_common_builder_pane_set_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_builder_pane_finalize;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH, g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS, g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID, g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 486 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_preferred_geometry;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_widget;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_installed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_uninstalled;
+#line 501 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self) {
+ gchar* _tmp0_ = NULL;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv = SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE (self);
+#line 10 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->_connect_signals = FALSE;
+#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _tmp0_ = g_strdup ("default");
+#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self->priv->_default_id = _tmp0_;
+#line 517 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_finalize (GObject* obj) {
+ ShotwellPluginsCommonBuilderPane * self;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_free0 (self->priv->_resource_path);
+#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_free0 (self->priv->_default_id);
+#line 19 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_object_unref0 (self->priv->builder);
+#line 20 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ _g_object_unref0 (self->priv->content);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ G_OBJECT_CLASS (shotwell_plugins_common_builder_pane_parent_class)->finalize (obj);
+#line 535 "BuilderPane.c"
+}
+
+
+GType shotwell_plugins_common_builder_pane_get_type (void) {
+ static volatile gsize shotwell_plugins_common_builder_pane_type_id__volatile = 0;
+ if (g_once_init_enter (&shotwell_plugins_common_builder_pane_type_id__volatile)) {
+ static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonBuilderPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_builder_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonBuilderPane), 0, (GInstanceInitFunc) shotwell_plugins_common_builder_pane_instance_init, NULL };
+ static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType shotwell_plugins_common_builder_pane_type_id;
+ shotwell_plugins_common_builder_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "ShotwellPluginsCommonBuilderPane", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
+ g_type_add_interface_static (shotwell_plugins_common_builder_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+ g_once_init_leave (&shotwell_plugins_common_builder_pane_type_id__volatile, shotwell_plugins_common_builder_pane_type_id);
+ }
+ return shotwell_plugins_common_builder_pane_type_id__volatile;
+}
+
+
+static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+ ShotwellPluginsCommonBuilderPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_value_set_enum (value, shotwell_plugins_common_builder_pane_get_preferred_geometry (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_value_take_string (value, shotwell_plugins_common_builder_pane_get_resource_path (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_value_set_boolean (value, shotwell_plugins_common_builder_pane_get_connect_signals (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ g_value_take_string (value, shotwell_plugins_common_builder_pane_get_default_id (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 582 "BuilderPane.c"
+ default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 588 "BuilderPane.c"
+ }
+}
+
+
+static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+ ShotwellPluginsCommonBuilderPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ shotwell_plugins_common_builder_pane_set_preferred_geometry (self, g_value_get_enum (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ shotwell_plugins_common_builder_pane_set_resource_path (self, g_value_get_string (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ shotwell_plugins_common_builder_pane_set_connect_signals (self, g_value_get_boolean (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ shotwell_plugins_common_builder_pane_set_default_id (self, g_value_get_string (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 622 "BuilderPane.c"
+ default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+ break;
+#line 628 "BuilderPane.c"
+ }
+}
+
+
+
diff --git a/plugins/common/BuilderPane.vala b/plugins/common/BuilderPane.vala
new file mode 100644
index 0000000..72b4b6f
--- /dev/null
+++ b/plugins/common/BuilderPane.vala
@@ -0,0 +1,60 @@
+/* Copyright 2016 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+using Spit.Publishing;
+
+namespace Shotwell.Plugins.Common {
+ public abstract class BuilderPane : Spit.Publishing.DialogPane, Object {
+ public DialogPane.GeometryOptions preferred_geometry {
+ get; construct; default = DialogPane.GeometryOptions.NONE;
+ }
+ public string resource_path { owned get; construct; }
+ public bool connect_signals { get; construct; default = false; }
+ public string default_id {
+ owned get; construct; default = "default";
+ }
+
+ private Gtk.Builder builder;
+ private Gtk.Widget content;
+
+ public override void constructed () {
+ base.constructed ();
+
+ debug ("Adding new builder from path %s", resource_path);
+
+ this.builder = new Gtk.Builder.from_resource (resource_path);
+ if (this.connect_signals) {
+ this.builder.connect_signals (null);
+ }
+
+ this.content = this.builder.get_object ("content") as Gtk.Widget;
+
+ // Just to be sure, if we still use old-style Builder files
+ if (this.content.parent != null) {
+ this.content.parent.remove (this.content);
+ }
+ }
+
+ public DialogPane.GeometryOptions get_preferred_geometry () {
+ return this.preferred_geometry;
+ }
+
+ public Gtk.Widget get_widget () {
+ return this.content;
+ }
+
+ public Gtk.Builder get_builder () {
+ return this.builder;
+ }
+
+ public virtual Gtk.Widget get_default_widget () {
+ return this.get_builder ().get_object (this.default_id) as Gtk.Widget;
+ }
+
+ public virtual void on_pane_installed () {}
+
+ public virtual void on_pane_uninstalled () {}
+ }
+}
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index 81fbf20..719d0a4 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -578,6 +578,7 @@ static void _g_free0_ (gpointer var);
void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table);
static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
static void _vala_SoupMultipart_free (SoupMultipart* self);
+static guint8* _vala_array_dup2 (guint8* self, int length);
static void _vala_SoupBuffer_free (SoupBuffer* self);
static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
gpointer publishing_rest_support_xml_document_ref (gpointer instance);
@@ -611,7 +612,7 @@ enum {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_DUMMY_PROPERTY
};
PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1);
-static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length);
static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self);
PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self, gint bytes_written_so_far, gint total_bytes);
@@ -777,13 +778,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 780 "RESTSupport.c"
+#line 781 "RESTSupport.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 786 "RESTSupport.c"
+#line 787 "RESTSupport.c"
}
@@ -845,7 +846,7 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
_g_hmac_unref0 (mac);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 848 "RESTSupport.c"
+#line 849 "RESTSupport.c"
}
@@ -877,7 +878,7 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 880 "RESTSupport.c"
+#line 881 "RESTSupport.c"
}
@@ -891,7 +892,7 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES
_tmp0_ = message;
#line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_);
-#line 894 "RESTSupport.c"
+#line 895 "RESTSupport.c"
}
@@ -900,7 +901,7 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "authenticated");
-#line 903 "RESTSupport.c"
+#line 904 "RESTSupport.c"
}
@@ -912,7 +913,7 @@ void publishing_rest_support_session_notify_authentication_failed (PublishingRES
_tmp0_ = err;
#line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "authentication-failed", _tmp0_);
-#line 915 "RESTSupport.c"
+#line 916 "RESTSupport.c"
}
@@ -921,7 +922,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return FALSE;
-#line 924 "RESTSupport.c"
+#line 925 "RESTSupport.c"
}
@@ -930,7 +931,7 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 933 "RESTSupport.c"
+#line 934 "RESTSupport.c"
}
@@ -948,7 +949,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
result = _tmp1_;
#line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 951 "RESTSupport.c"
+#line 952 "RESTSupport.c"
}
@@ -962,7 +963,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
_tmp0_ = self->priv->soup_session;
#line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_session_abort (_tmp0_);
-#line 965 "RESTSupport.c"
+#line 966 "RESTSupport.c"
}
@@ -977,14 +978,14 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
result = _tmp0_;
#line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 980 "RESTSupport.c"
+#line 981 "RESTSupport.c"
}
static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 987 "RESTSupport.c"
+#line 988 "RESTSupport.c"
}
@@ -1005,7 +1006,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
if (_tmp0_) {
#line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 1008 "RESTSupport.c"
+#line 1009 "RESTSupport.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->soup_session;
@@ -1023,7 +1024,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 1026 "RESTSupport.c"
+#line 1027 "RESTSupport.c"
}
@@ -1040,14 +1041,14 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession*
_tmp1_ = self->priv->soup_session;
#line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
-#line 1043 "RESTSupport.c"
+#line 1044 "RESTSupport.c"
}
static void publishing_rest_support_value_session_init (GValue* value) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1050 "RESTSupport.c"
+#line 1051 "RESTSupport.c"
}
@@ -1056,7 +1057,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 1059 "RESTSupport.c"
+#line 1060 "RESTSupport.c"
}
}
@@ -1066,11 +1067,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
if (src_value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 1069 "RESTSupport.c"
+#line 1070 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1073 "RESTSupport.c"
+#line 1074 "RESTSupport.c"
}
}
@@ -1078,37 +1079,37 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1081 "RESTSupport.c"
+#line 1082 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 1088 "RESTSupport.c"
+#line 1089 "RESTSupport.c"
PublishingRESTSupportSession* object;
object = collect_values[0].v_pointer;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1095 "RESTSupport.c"
+#line 1096 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 1099 "RESTSupport.c"
+#line 1100 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 1103 "RESTSupport.c"
+#line 1104 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1107 "RESTSupport.c"
+#line 1108 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1111 "RESTSupport.c"
+#line 1112 "RESTSupport.c"
}
@@ -1119,25 +1120,25 @@ static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* v
if (!object_p) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1122 "RESTSupport.c"
+#line 1123 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 1128 "RESTSupport.c"
+#line 1129 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 1132 "RESTSupport.c"
+#line 1133 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1136 "RESTSupport.c"
+#line 1137 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1140 "RESTSupport.c"
+#line 1141 "RESTSupport.c"
}
@@ -1151,7 +1152,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1154 "RESTSupport.c"
+#line 1155 "RESTSupport.c"
}
@@ -1160,7 +1161,7 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1163 "RESTSupport.c"
+#line 1164 "RESTSupport.c"
}
@@ -1180,17 +1181,17 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
value->data[0].v_pointer = v_object;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1183 "RESTSupport.c"
+#line 1184 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1187 "RESTSupport.c"
+#line 1188 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (old);
-#line 1193 "RESTSupport.c"
+#line 1194 "RESTSupport.c"
}
}
@@ -1209,17 +1210,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1212 "RESTSupport.c"
+#line 1213 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1216 "RESTSupport.c"
+#line 1217 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (old);
-#line 1222 "RESTSupport.c"
+#line 1223 "RESTSupport.c"
}
}
@@ -1239,7 +1240,7 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1242 "RESTSupport.c"
+#line 1243 "RESTSupport.c"
}
@@ -1254,7 +1255,7 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
self->priv->transactions_stopped = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1257 "RESTSupport.c"
+#line 1258 "RESTSupport.c"
}
@@ -1268,7 +1269,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
_g_free0 (self->priv->endpoint_url);
#line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->soup_session);
-#line 1271 "RESTSupport.c"
+#line 1272 "RESTSupport.c"
}
@@ -1293,7 +1294,7 @@ gpointer publishing_rest_support_session_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1296 "RESTSupport.c"
+#line 1297 "RESTSupport.c"
}
@@ -1306,7 +1307,7 @@ void publishing_rest_support_session_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1309 "RESTSupport.c"
+#line 1310 "RESTSupport.c"
}
}
@@ -1317,7 +1318,7 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
switch (self) {
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1320 "RESTSupport.c"
+#line 1321 "RESTSupport.c"
{
gchar* _tmp0_ = NULL;
#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1326,11 +1327,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp0_;
#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1329 "RESTSupport.c"
+#line 1330 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1333 "RESTSupport.c"
+#line 1334 "RESTSupport.c"
{
gchar* _tmp1_ = NULL;
#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1339,11 +1340,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp1_;
#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1342 "RESTSupport.c"
+#line 1343 "RESTSupport.c"
}
#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1346 "RESTSupport.c"
+#line 1347 "RESTSupport.c"
{
gchar* _tmp2_ = NULL;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1352,13 +1353,13 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
result = _tmp2_;
#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1355 "RESTSupport.c"
+#line 1356 "RESTSupport.c"
}
default:
{
#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1361 "RESTSupport.c"
+#line 1362 "RESTSupport.c"
}
}
}
@@ -1377,7 +1378,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1380 "RESTSupport.c"
+#line 1381 "RESTSupport.c"
} else {
const gchar* _tmp1_ = NULL;
#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1388,7 +1389,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1391 "RESTSupport.c"
+#line 1392 "RESTSupport.c"
} else {
const gchar* _tmp2_ = NULL;
#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1399,14 +1400,14 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1402 "RESTSupport.c"
+#line 1403 "RESTSupport.c"
} else {
const gchar* _tmp3_ = NULL;
#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = str;
#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
-#line 1409 "RESTSupport.c"
+#line 1410 "RESTSupport.c"
}
}
}
@@ -1455,14 +1456,14 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
self->value = _tmp3_;
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1458 "RESTSupport.c"
+#line 1459 "RESTSupport.c"
}
PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1465 "RESTSupport.c"
+#line 1466 "RESTSupport.c"
}
@@ -1494,7 +1495,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
result = _tmp5_;
#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1497 "RESTSupport.c"
+#line 1498 "RESTSupport.c"
}
@@ -1503,14 +1504,14 @@ static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconst
result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1506 "RESTSupport.c"
+#line 1507 "RESTSupport.c"
}
static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1513 "RESTSupport.c"
+#line 1514 "RESTSupport.c"
}
@@ -1533,7 +1534,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
_tmp1_ = inputArray;
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = inputArray_length1;
-#line 1536 "RESTSupport.c"
+#line 1537 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
@@ -1545,14 +1546,14 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
arg_collection_length1 = _tmp1__length1;
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1548 "RESTSupport.c"
+#line 1549 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp2_ = NULL;
PublishingRESTSupportArgument* arg = NULL;
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp2_;
-#line 1555 "RESTSupport.c"
+#line 1556 "RESTSupport.c"
{
GeeTreeSet* _tmp3_ = NULL;
PublishingRESTSupportArgument* _tmp4_ = NULL;
@@ -1564,7 +1565,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 1567 "RESTSupport.c"
+#line 1568 "RESTSupport.c"
}
}
}
@@ -1580,7 +1581,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
if (result_length1) {
#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp8__length1;
-#line 1583 "RESTSupport.c"
+#line 1584 "RESTSupport.c"
}
#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp8_;
@@ -1588,7 +1589,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
_g_object_unref0 (sorted_args);
#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1591 "RESTSupport.c"
+#line 1592 "RESTSupport.c"
}
@@ -1609,14 +1610,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
result = _tmp2_;
#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1612 "RESTSupport.c"
+#line 1613 "RESTSupport.c"
}
static void publishing_rest_support_value_argument_init (GValue* value) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1619 "RESTSupport.c"
+#line 1620 "RESTSupport.c"
}
@@ -1625,7 +1626,7 @@ static void publishing_rest_support_value_argument_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1628 "RESTSupport.c"
+#line 1629 "RESTSupport.c"
}
}
@@ -1635,11 +1636,11 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
if (src_value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1638 "RESTSupport.c"
+#line 1639 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1642 "RESTSupport.c"
+#line 1643 "RESTSupport.c"
}
}
@@ -1647,37 +1648,37 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1650 "RESTSupport.c"
+#line 1651 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 1657 "RESTSupport.c"
+#line 1658 "RESTSupport.c"
PublishingRESTSupportArgument* object;
object = collect_values[0].v_pointer;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1664 "RESTSupport.c"
+#line 1665 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 1668 "RESTSupport.c"
+#line 1669 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1672 "RESTSupport.c"
+#line 1673 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1676 "RESTSupport.c"
+#line 1677 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1680 "RESTSupport.c"
+#line 1681 "RESTSupport.c"
}
@@ -1688,25 +1689,25 @@ static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue*
if (!object_p) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1691 "RESTSupport.c"
+#line 1692 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 1697 "RESTSupport.c"
+#line 1698 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 1701 "RESTSupport.c"
+#line 1702 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1705 "RESTSupport.c"
+#line 1706 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1709 "RESTSupport.c"
+#line 1710 "RESTSupport.c"
}
@@ -1720,7 +1721,7 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons
G_PARAM_SPEC (spec)->value_type = object_type;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1723 "RESTSupport.c"
+#line 1724 "RESTSupport.c"
}
@@ -1729,7 +1730,7 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1732 "RESTSupport.c"
+#line 1733 "RESTSupport.c"
}
@@ -1749,17 +1750,17 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec
value->data[0].v_pointer = v_object;
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1752 "RESTSupport.c"
+#line 1753 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1756 "RESTSupport.c"
+#line 1757 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (old);
-#line 1762 "RESTSupport.c"
+#line 1763 "RESTSupport.c"
}
}
@@ -1778,17 +1779,17 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1781 "RESTSupport.c"
+#line 1782 "RESTSupport.c"
} else {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1785 "RESTSupport.c"
+#line 1786 "RESTSupport.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (old);
-#line 1791 "RESTSupport.c"
+#line 1792 "RESTSupport.c"
}
}
@@ -1798,14 +1799,14 @@ static void publishing_rest_support_argument_class_init (PublishingRESTSupportAr
publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1801 "RESTSupport.c"
+#line 1802 "RESTSupport.c"
}
static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1808 "RESTSupport.c"
+#line 1809 "RESTSupport.c"
}
@@ -1819,7 +1820,7 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu
_g_free0 (self->key);
#line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->value);
-#line 1822 "RESTSupport.c"
+#line 1823 "RESTSupport.c"
}
@@ -1844,7 +1845,7 @@ gpointer publishing_rest_support_argument_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1847 "RESTSupport.c"
+#line 1848 "RESTSupport.c"
}
@@ -1857,7 +1858,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1860 "RESTSupport.c"
+#line 1861 "RESTSupport.c"
}
}
@@ -1865,7 +1866,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1868 "RESTSupport.c"
+#line 1869 "RESTSupport.c"
}
@@ -1929,14 +1930,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1932 "RESTSupport.c"
+#line 1933 "RESTSupport.c"
}
PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1939 "RESTSupport.c"
+#line 1940 "RESTSupport.c"
}
@@ -1986,14 +1987,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
_g_free0 (_tmp5_);
#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1989 "RESTSupport.c"
+#line 1990 "RESTSupport.c"
}
PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 1996 "RESTSupport.c"
+#line 1997 "RESTSupport.c"
}
@@ -2027,14 +2028,14 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
_tmp6_ = _tmp5_->length;
#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_);
-#line 2030 "RESTSupport.c"
+#line 2031 "RESTSupport.c"
}
static gpointer _g_error_copy0 (gpointer self) {
#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_error_copy (self) : NULL;
-#line 2037 "RESTSupport.c"
+#line 2038 "RESTSupport.c"
}
@@ -2054,7 +2055,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
if (_tmp0_ != _tmp1_) {
#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2057 "RESTSupport.c"
+#line 2058 "RESTSupport.c"
}
{
SoupMessage* _tmp2_ = NULL;
@@ -2066,7 +2067,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2069 "RESTSupport.c"
+#line 2070 "RESTSupport.c"
goto __catch0_spit_publishing_publishing_error;
}
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2075,7 +2076,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2078 "RESTSupport.c"
+#line 2079 "RESTSupport.c"
}
}
goto __finally0;
@@ -2116,7 +2117,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
self->priv->err = _tmp8_;
#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 2119 "RESTSupport.c"
+#line 2120 "RESTSupport.c"
}
__finally0:
#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2127,7 +2128,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
g_clear_error (&_inner_error_);
#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2130 "RESTSupport.c"
+#line 2131 "RESTSupport.c"
}
}
@@ -2135,7 +2136,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
static gpointer _g_object_ref0 (gpointer self) {
#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_object_ref (self) : NULL;
-#line 2138 "RESTSupport.c"
+#line 2139 "RESTSupport.c"
}
@@ -2186,7 +2187,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp5_ = tls_errors;
#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2189 "RESTSupport.c"
+#line 2190 "RESTSupport.c"
GeeArrayList* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2196,13 +2197,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"bsite.");
#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 2198 "RESTSupport.c"
+#line 2199 "RESTSupport.c"
}
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = tls_errors;
#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2204 "RESTSupport.c"
+#line 2205 "RESTSupport.c"
GeeArrayList* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2212,13 +2213,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
" your computer’s calendar.");
#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 2213 "RESTSupport.c"
+#line 2214 "RESTSupport.c"
}
#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = tls_errors;
#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2219 "RESTSupport.c"
+#line 2220 "RESTSupport.c"
GeeArrayList* _tmp12_ = NULL;
const gchar* _tmp13_ = NULL;
#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2228,13 +2229,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"on.");
#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 2228 "RESTSupport.c"
+#line 2229 "RESTSupport.c"
}
#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = tls_errors;
#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2234 "RESTSupport.c"
+#line 2235 "RESTSupport.c"
GeeArrayList* _tmp15_ = NULL;
const gchar* _tmp16_ = NULL;
#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2244,13 +2245,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"upted.");
#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
-#line 2243 "RESTSupport.c"
+#line 2244 "RESTSupport.c"
}
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = tls_errors;
#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2249 "RESTSupport.c"
+#line 2250 "RESTSupport.c"
GeeArrayList* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2260,13 +2261,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"zation that issued it.");
#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 2258 "RESTSupport.c"
+#line 2259 "RESTSupport.c"
}
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = tls_errors;
#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2264 "RESTSupport.c"
+#line 2265 "RESTSupport.c"
GeeArrayList* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2276,13 +2277,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
" weak encryption.");
#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2273 "RESTSupport.c"
+#line 2274 "RESTSupport.c"
}
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = tls_errors;
#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2279 "RESTSupport.c"
+#line 2280 "RESTSupport.c"
GeeArrayList* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2292,7 +2293,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
"the date on your computer’s calendar.");
#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
-#line 2288 "RESTSupport.c"
+#line 2289 "RESTSupport.c"
}
#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = g_string_new ("");
@@ -2306,7 +2307,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_tmp29_ = _tmp28_;
#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp29_ == 1) {
-#line 2302 "RESTSupport.c"
+#line 2303 "RESTSupport.c"
GString* _tmp30_ = NULL;
GeeArrayList* _tmp31_ = NULL;
gpointer _tmp32_ = NULL;
@@ -2323,7 +2324,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append (_tmp30_, _tmp33_);
#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp33_);
-#line 2319 "RESTSupport.c"
+#line 2320 "RESTSupport.c"
} else {
{
GeeArrayList* _entry_list = NULL;
@@ -2352,7 +2353,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
_entry_index = -1;
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 2348 "RESTSupport.c"
+#line 2349 "RESTSupport.c"
gint _tmp39_ = 0;
gint _tmp40_ = 0;
gint _tmp41_ = 0;
@@ -2374,7 +2375,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (!(_tmp40_ < _tmp41_)) {
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2370 "RESTSupport.c"
+#line 2371 "RESTSupport.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = _entry_list;
@@ -2392,11 +2393,11 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
g_string_append_printf (_tmp45_, "%s\n", _tmp46_);
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (entry);
-#line 2388 "RESTSupport.c"
+#line 2389 "RESTSupport.c"
}
#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_entry_list);
-#line 2392 "RESTSupport.c"
+#line 2393 "RESTSupport.c"
}
}
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2415,15 +2416,15 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
if (cert) {
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*cert = _vala_cert;
-#line 2411 "RESTSupport.c"
+#line 2412 "RESTSupport.c"
} else {
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_vala_cert);
-#line 2415 "RESTSupport.c"
+#line 2416 "RESTSupport.c"
}
#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2419 "RESTSupport.c"
+#line 2420 "RESTSupport.c"
}
@@ -2453,17 +2454,17 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
case SOUP_STATUS_OK:
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CREATED:
-#line 2449 "RESTSupport.c"
+#line 2450 "RESTSupport.c"
{
#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2453 "RESTSupport.c"
+#line 2454 "RESTSupport.c"
}
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE:
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2459 "RESTSupport.c"
+#line 2460 "RESTSupport.c"
{
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -2496,7 +2497,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2492 "RESTSupport.c"
+#line 2493 "RESTSupport.c"
} else {
#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2504,14 +2505,14 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2500 "RESTSupport.c"
+#line 2501 "RESTSupport.c"
}
}
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT:
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2507 "RESTSupport.c"
+#line 2508 "RESTSupport.c"
{
gchar* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
@@ -2544,7 +2545,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2540 "RESTSupport.c"
+#line 2541 "RESTSupport.c"
} else {
#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2552,12 +2553,12 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2548 "RESTSupport.c"
+#line 2549 "RESTSupport.c"
}
}
#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_SSL_FAILED:
-#line 2553 "RESTSupport.c"
+#line 2554 "RESTSupport.c"
{
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
@@ -2581,7 +2582,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2577 "RESTSupport.c"
+#line 2578 "RESTSupport.c"
} else {
#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2589,7 +2590,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2585 "RESTSupport.c"
+#line 2586 "RESTSupport.c"
}
}
default:
@@ -2605,7 +2606,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
_tmp23_ = _tmp22_;
#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp23_ >= ((guint) 100)) {
-#line 2601 "RESTSupport.c"
+#line 2602 "RESTSupport.c"
gchar* _tmp24_ = NULL;
gchar* _tmp25_ = NULL;
SoupMessage* _tmp26_ = NULL;
@@ -2651,7 +2652,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2647 "RESTSupport.c"
+#line 2648 "RESTSupport.c"
} else {
#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2659,7 +2660,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2655 "RESTSupport.c"
+#line 2656 "RESTSupport.c"
}
} else {
gchar* _tmp35_ = NULL;
@@ -2693,7 +2694,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2689 "RESTSupport.c"
+#line 2690 "RESTSupport.c"
} else {
#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2701,7 +2702,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2697 "RESTSupport.c"
+#line 2698 "RESTSupport.c"
}
}
}
@@ -2718,7 +2719,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
if (_tmp45_ == NULL) {
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = TRUE;
-#line 2714 "RESTSupport.c"
+#line 2715 "RESTSupport.c"
} else {
SoupMessage* _tmp46_ = NULL;
SoupMessageBody* _tmp47_ = NULL;
@@ -2734,11 +2735,11 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
_tmp48__length1 = (gint) _tmp47_->length;
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = _tmp48__length1 == 0;
-#line 2730 "RESTSupport.c"
+#line 2731 "RESTSupport.c"
}
#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp42_) {
-#line 2734 "RESTSupport.c"
+#line 2735 "RESTSupport.c"
gchar* _tmp49_ = NULL;
gchar* _tmp50_ = NULL;
GError* _tmp51_ = NULL;
@@ -2761,7 +2762,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_propagate_error (error, _inner_error_);
#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2757 "RESTSupport.c"
+#line 2758 "RESTSupport.c"
} else {
#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2769,7 +2770,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
g_clear_error (&_inner_error_);
#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2765 "RESTSupport.c"
+#line 2766 "RESTSupport.c"
}
}
}
@@ -2782,17 +2783,17 @@ static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportAr
result = g_new0 (PublishingRESTSupportArgument*, length + 1);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 2778 "RESTSupport.c"
+#line 2779 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp0_ = NULL;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 2784 "RESTSupport.c"
+#line 2785 "RESTSupport.c"
}
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2788 "RESTSupport.c"
+#line 2789 "RESTSupport.c"
}
@@ -2822,13 +2823,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
if (result_length1) {
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp2__length1;
-#line 2818 "RESTSupport.c"
+#line 2819 "RESTSupport.c"
}
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2824 "RESTSupport.c"
+#line 2825 "RESTSupport.c"
}
@@ -2868,13 +2869,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
if (result_length1) {
#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp6__length1;
-#line 2864 "RESTSupport.c"
+#line 2865 "RESTSupport.c"
}
#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp6_;
#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2870 "RESTSupport.c"
+#line 2871 "RESTSupport.c"
}
@@ -2886,14 +2887,14 @@ void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportT
_tmp0_ = is_executed;
#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = _tmp0_;
-#line 2882 "RESTSupport.c"
+#line 2883 "RESTSupport.c"
}
static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2889 "RESTSupport.c"
+#line 2890 "RESTSupport.c"
}
@@ -2941,23 +2942,23 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
_tmp8_ = self->priv->err;
#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 2937 "RESTSupport.c"
+#line 2938 "RESTSupport.c"
GError* _tmp9_ = NULL;
#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->err;
#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "network-error", _tmp9_);
-#line 2943 "RESTSupport.c"
+#line 2944 "RESTSupport.c"
} else {
#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "completed");
-#line 2947 "RESTSupport.c"
+#line 2948 "RESTSupport.c"
}
#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->err;
#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp10_ != NULL) {
-#line 2953 "RESTSupport.c"
+#line 2954 "RESTSupport.c"
GError* _tmp11_ = NULL;
GError* _tmp12_ = NULL;
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2972,7 +2973,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_propagate_error (error, _inner_error_);
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2968 "RESTSupport.c"
+#line 2969 "RESTSupport.c"
} else {
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -2980,7 +2981,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
g_clear_error (&_inner_error_);
#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2976 "RESTSupport.c"
+#line 2977 "RESTSupport.c"
}
}
}
@@ -3014,7 +3015,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
result = _tmp5_;
#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3010 "RESTSupport.c"
+#line 3011 "RESTSupport.c"
}
@@ -3037,7 +3038,7 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
_tmp3_ = value;
#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 3033 "RESTSupport.c"
+#line 3034 "RESTSupport.c"
}
@@ -3046,7 +3047,7 @@ void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransa
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 3042 "RESTSupport.c"
+#line 3043 "RESTSupport.c"
}
@@ -3080,19 +3081,19 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
self->priv->use_custom_payload = FALSE;
#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3076 "RESTSupport.c"
+#line 3077 "RESTSupport.c"
}
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = payload_length;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp3_ > ((gulong) 0)) {
-#line 3082 "RESTSupport.c"
+#line 3083 "RESTSupport.c"
gulong _tmp4_ = 0UL;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = payload_length;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp4_;
-#line 3088 "RESTSupport.c"
+#line 3089 "RESTSupport.c"
} else {
const gchar* _tmp5_ = NULL;
gint _tmp6_ = 0;
@@ -3105,7 +3106,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
_tmp7_ = _tmp6_;
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = (gulong) _tmp7_;
-#line 3101 "RESTSupport.c"
+#line 3102 "RESTSupport.c"
}
#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
length = _tmp2_;
@@ -3127,7 +3128,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
#line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = TRUE;
-#line 3123 "RESTSupport.c"
+#line 3124 "RESTSupport.c"
}
@@ -3146,7 +3147,7 @@ void publishing_rest_support_transaction_set_message (PublishingRESTSupportTrans
_g_object_unref0 (self->priv->message);
#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->message = _tmp1_;
-#line 3142 "RESTSupport.c"
+#line 3143 "RESTSupport.c"
}
@@ -3161,7 +3162,7 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp
result = _tmp0_;
#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3157 "RESTSupport.c"
+#line 3158 "RESTSupport.c"
}
@@ -3187,14 +3188,14 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
result = _tmp3_;
#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3183 "RESTSupport.c"
+#line 3184 "RESTSupport.c"
}
static void _vala_SoupURI_free (SoupURI* self) {
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 3190 "RESTSupport.c"
+#line 3191 "RESTSupport.c"
}
@@ -3224,7 +3225,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_propagate_error (error, _inner_error_);
#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3220 "RESTSupport.c"
+#line 3221 "RESTSupport.c"
} else {
#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -3232,18 +3233,18 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3228 "RESTSupport.c"
+#line 3229 "RESTSupport.c"
}
}
#line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3233 "RESTSupport.c"
+#line 3234 "RESTSupport.c"
}
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_transaction_get_method (self);
#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3239 "RESTSupport.c"
+#line 3240 "RESTSupport.c"
PublishingRESTSupportArgument** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3252,25 +3253,25 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp2__length1 = self->priv->arguments_length1;
#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3248 "RESTSupport.c"
+#line 3249 "RESTSupport.c"
}
#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("");
#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
formdata_string = _tmp3_;
-#line 3254 "RESTSupport.c"
+#line 3255 "RESTSupport.c"
{
gint i = 0;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = 0;
-#line 3259 "RESTSupport.c"
+#line 3260 "RESTSupport.c"
{
gboolean _tmp4_ = FALSE;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = TRUE;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 3266 "RESTSupport.c"
+#line 3267 "RESTSupport.c"
gint _tmp6_ = 0;
PublishingRESTSupportArgument** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
@@ -3287,13 +3288,13 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
gint _tmp16__length1 = 0;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 3283 "RESTSupport.c"
+#line 3284 "RESTSupport.c"
gint _tmp5_ = 0;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = i;
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = _tmp5_ + 1;
-#line 3289 "RESTSupport.c"
+#line 3290 "RESTSupport.c"
}
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = FALSE;
@@ -3307,7 +3308,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
if (!(_tmp6_ < _tmp7__length1)) {
#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 3303 "RESTSupport.c"
+#line 3304 "RESTSupport.c"
}
#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = formdata_string;
@@ -3339,7 +3340,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp16__length1 = self->priv->arguments_length1;
#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3335 "RESTSupport.c"
+#line 3336 "RESTSupport.c"
const gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3350,7 +3351,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (formdata_string);
#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
formdata_string = _tmp18_;
-#line 3346 "RESTSupport.c"
+#line 3347 "RESTSupport.c"
}
}
}
@@ -3363,7 +3364,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp20_ = publishing_rest_support_transaction_get_method (self);
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3359 "RESTSupport.c"
+#line 3360 "RESTSupport.c"
PublishingRESTSupportArgument** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3372,15 +3373,15 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp21__length1 = self->priv->arguments_length1;
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = _tmp21__length1 > 0;
-#line 3368 "RESTSupport.c"
+#line 3369 "RESTSupport.c"
} else {
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = FALSE;
-#line 3372 "RESTSupport.c"
+#line 3373 "RESTSupport.c"
}
#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp19_) {
-#line 3376 "RESTSupport.c"
+#line 3377 "RESTSupport.c"
SoupMessage* _tmp22_ = NULL;
SoupURI* _tmp23_ = NULL;
gchar* _tmp24_ = NULL;
@@ -3436,7 +3437,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
soup_message_set_uri (_tmp31_, _tmp34_);
#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupURI_free0 (_tmp34_);
-#line 3432 "RESTSupport.c"
+#line 3433 "RESTSupport.c"
} else {
SoupMessage* _tmp35_ = NULL;
const gchar* _tmp36_ = NULL;
@@ -3456,11 +3457,11 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp38__length1 = _tmp37__length1;
#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3452 "RESTSupport.c"
+#line 3453 "RESTSupport.c"
}
#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 3456 "RESTSupport.c"
+#line 3457 "RESTSupport.c"
{
SoupMessage* _tmp39_ = NULL;
SoupURI* _tmp40_ = NULL;
@@ -3482,7 +3483,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
publishing_rest_support_transaction_send (self, &_inner_error_);
#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3478 "RESTSupport.c"
+#line 3479 "RESTSupport.c"
goto __finally1;
}
}
@@ -3493,7 +3494,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_tmp43_ = old_url;
#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp43_ != NULL) {
-#line 3489 "RESTSupport.c"
+#line 3490 "RESTSupport.c"
SoupMessage* _tmp44_ = NULL;
const gchar* _tmp45_ = NULL;
SoupURI* _tmp46_ = NULL;
@@ -3510,7 +3511,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
soup_message_set_uri (_tmp44_, _tmp47_);
#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupURI_free0 (_tmp47_);
-#line 3506 "RESTSupport.c"
+#line 3507 "RESTSupport.c"
}
}
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3527,7 +3528,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (formdata_string);
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3523 "RESTSupport.c"
+#line 3524 "RESTSupport.c"
} else {
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
@@ -3541,7 +3542,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
g_clear_error (&_inner_error_);
#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3537 "RESTSupport.c"
+#line 3538 "RESTSupport.c"
}
}
#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3550,7 +3551,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
_g_free0 (old_url);
#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 3546 "RESTSupport.c"
+#line 3547 "RESTSupport.c"
}
@@ -3559,7 +3560,7 @@ void publishing_rest_support_transaction_execute (PublishingRESTSupportTransacti
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3555 "RESTSupport.c"
+#line 3556 "RESTSupport.c"
}
@@ -3591,7 +3592,7 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
result = _tmp4_;
#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3587 "RESTSupport.c"
+#line 3588 "RESTSupport.c"
}
@@ -3614,7 +3615,7 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
result = _tmp2_;
#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3610 "RESTSupport.c"
+#line 3611 "RESTSupport.c"
}
@@ -3637,7 +3638,7 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
result = _tmp2_;
#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3633 "RESTSupport.c"
+#line 3634 "RESTSupport.c"
}
@@ -3648,13 +3649,13 @@ static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* lengt
*size = (*size) ? (2 * (*size)) : 4;
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3644 "RESTSupport.c"
+#line 3645 "RESTSupport.c"
}
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[(*length)++] = value;
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[*length] = NULL;
-#line 3650 "RESTSupport.c"
+#line 3651 "RESTSupport.c"
}
@@ -3682,7 +3683,7 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3678 "RESTSupport.c"
+#line 3679 "RESTSupport.c"
}
@@ -3696,7 +3697,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_tmp1_ = self->priv->endpoint_url;
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 3692 "RESTSupport.c"
+#line 3693 "RESTSupport.c"
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3707,7 +3708,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp3_;
-#line 3703 "RESTSupport.c"
+#line 3704 "RESTSupport.c"
} else {
PublishingRESTSupportSession* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -3719,20 +3720,20 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
_g_free0 (_tmp0_);
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp5_;
-#line 3715 "RESTSupport.c"
+#line 3716 "RESTSupport.c"
}
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3721 "RESTSupport.c"
+#line 3722 "RESTSupport.c"
}
static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3728 "RESTSupport.c"
+#line 3729 "RESTSupport.c"
}
@@ -3750,7 +3751,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
result = _tmp1_;
#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3746 "RESTSupport.c"
+#line 3747 "RESTSupport.c"
}
@@ -3769,26 +3770,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
data1 = closure->data;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = param_values->data[0].v_pointer;
-#line 3765 "RESTSupport.c"
+#line 3766 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data1 = param_values->data[0].v_pointer;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = closure->data;
-#line 3771 "RESTSupport.c"
+#line 3772 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3777 "RESTSupport.c"
+#line 3778 "RESTSupport.c"
}
static void publishing_rest_support_value_transaction_init (GValue* value) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3784 "RESTSupport.c"
+#line 3785 "RESTSupport.c"
}
@@ -3797,7 +3798,7 @@ static void publishing_rest_support_value_transaction_free_value (GValue* value)
if (value->data[0].v_pointer) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3793 "RESTSupport.c"
+#line 3794 "RESTSupport.c"
}
}
@@ -3807,11 +3808,11 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
if (src_value->data[0].v_pointer) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3803 "RESTSupport.c"
+#line 3804 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3807 "RESTSupport.c"
+#line 3808 "RESTSupport.c"
}
}
@@ -3819,37 +3820,37 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3815 "RESTSupport.c"
+#line 3816 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 3822 "RESTSupport.c"
+#line 3823 "RESTSupport.c"
PublishingRESTSupportTransaction* object;
object = collect_values[0].v_pointer;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3829 "RESTSupport.c"
+#line 3830 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 3833 "RESTSupport.c"
+#line 3834 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3837 "RESTSupport.c"
+#line 3838 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3841 "RESTSupport.c"
+#line 3842 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3845 "RESTSupport.c"
+#line 3846 "RESTSupport.c"
}
@@ -3860,25 +3861,25 @@ static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValu
if (!object_p) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3856 "RESTSupport.c"
+#line 3857 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 3862 "RESTSupport.c"
+#line 3863 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 3866 "RESTSupport.c"
+#line 3867 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3870 "RESTSupport.c"
+#line 3871 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3874 "RESTSupport.c"
+#line 3875 "RESTSupport.c"
}
@@ -3892,7 +3893,7 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c
G_PARAM_SPEC (spec)->value_type = object_type;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 3888 "RESTSupport.c"
+#line 3889 "RESTSupport.c"
}
@@ -3901,7 +3902,7 @@ gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3897 "RESTSupport.c"
+#line 3898 "RESTSupport.c"
}
@@ -3921,17 +3922,17 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob
value->data[0].v_pointer = v_object;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3917 "RESTSupport.c"
+#line 3918 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3921 "RESTSupport.c"
+#line 3922 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3927 "RESTSupport.c"
+#line 3928 "RESTSupport.c"
}
}
@@ -3950,17 +3951,17 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 3946 "RESTSupport.c"
+#line 3947 "RESTSupport.c"
} else {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3950 "RESTSupport.c"
+#line 3951 "RESTSupport.c"
}
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3956 "RESTSupport.c"
+#line 3957 "RESTSupport.c"
}
}
@@ -3982,7 +3983,7 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor
g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3978 "RESTSupport.c"
+#line 3979 "RESTSupport.c"
}
@@ -4003,7 +4004,7 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup
self->priv->endpoint_url = NULL;
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 3999 "RESTSupport.c"
+#line 4000 "RESTSupport.c"
}
@@ -4021,7 +4022,7 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT
_g_error_free0 (self->priv->err);
#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 4017 "RESTSupport.c"
+#line 4018 "RESTSupport.c"
}
@@ -4046,7 +4047,7 @@ gpointer publishing_rest_support_transaction_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 4042 "RESTSupport.c"
+#line 4043 "RESTSupport.c"
}
@@ -4059,7 +4060,7 @@ void publishing_rest_support_transaction_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 4055 "RESTSupport.c"
+#line 4056 "RESTSupport.c"
}
}
@@ -4114,14 +4115,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
self->message_headers = _tmp7_;
#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4110 "RESTSupport.c"
+#line 4111 "RESTSupport.c"
}
PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 4117 "RESTSupport.c"
+#line 4118 "RESTSupport.c"
}
@@ -4180,14 +4181,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
self->message_headers = _tmp8_;
#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4176 "RESTSupport.c"
+#line 4177 "RESTSupport.c"
}
PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 4183 "RESTSupport.c"
+#line 4184 "RESTSupport.c"
}
@@ -4210,7 +4211,7 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
_tmp2_ = value;
#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 4206 "RESTSupport.c"
+#line 4207 "RESTSupport.c"
}
@@ -4221,7 +4222,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
_tmp0_ = media_type;
#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4217 "RESTSupport.c"
+#line 4218 "RESTSupport.c"
gchar* _tmp1_ = NULL;
#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_strdup ("image/jpeg");
@@ -4229,14 +4230,14 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
result = _tmp1_;
#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4225 "RESTSupport.c"
+#line 4226 "RESTSupport.c"
} else {
SpitPublishingPublisherMediaType _tmp2_ = 0;
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = media_type;
#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4232 "RESTSupport.c"
+#line 4233 "RESTSupport.c"
gchar* _tmp3_ = NULL;
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("video/mpeg");
@@ -4244,7 +4245,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
result = _tmp3_;
#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4240 "RESTSupport.c"
+#line 4241 "RESTSupport.c"
} else {
SpitPublishingPublisherMediaType _tmp4_ = 0;
GEnumValue* _tmp5_;
@@ -4254,7 +4255,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
_tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 4250 "RESTSupport.c"
+#line 4251 "RESTSupport.c"
}
}
}
@@ -4263,7 +4264,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
static void _g_free0_ (gpointer var) {
#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
var = (g_free (var), NULL);
-#line 4259 "RESTSupport.c"
+#line 4260 "RESTSupport.c"
}
@@ -4314,14 +4315,14 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
result = _result_;
#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4310 "RESTSupport.c"
+#line 4311 "RESTSupport.c"
}
static gpointer _g_hash_table_ref0 (gpointer self) {
#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 4317 "RESTSupport.c"
+#line 4318 "RESTSupport.c"
}
@@ -4340,21 +4341,28 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu
_g_hash_table_unref0 (self->binary_disposition_table);
#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = _tmp1_;
-#line 4336 "RESTSupport.c"
+#line 4337 "RESTSupport.c"
}
static void _vala_SoupMultipart_free (SoupMultipart* self) {
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 4343 "RESTSupport.c"
+#line 4344 "RESTSupport.c"
+}
+
+
+static guint8* _vala_array_dup2 (guint8* self, int length) {
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return g_memdup (self, length * sizeof (guint8));
+#line 4351 "RESTSupport.c"
}
static void _vala_SoupBuffer_free (SoupBuffer* self) {
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 4350 "RESTSupport.c"
+#line 4358 "RESTSupport.c"
}
@@ -4382,7 +4390,8 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gint _tmp23__length1 = 0;
guint8* _tmp24_ = NULL;
gint _tmp24__length1 = 0;
- gsize _tmp25_ = 0UL;
+ guint8* _tmp25_ = NULL;
+ gint _tmp25__length1 = 0;
SoupBuffer* _tmp26_ = NULL;
SoupMultipart* _tmp27_ = NULL;
SpitPublishingPublishable* _tmp28_ = NULL;
@@ -4438,7 +4447,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_tmp4_ = request_arguments;
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4__length1 = request_arguments_length1;
-#line 4434 "RESTSupport.c"
+#line 4443 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
@@ -4450,14 +4459,14 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
arg_collection_length1 = _tmp4__length1;
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4446 "RESTSupport.c"
+#line 4455 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp5_ = NULL;
PublishingRESTSupportArgument* arg = NULL;
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp5_;
-#line 4453 "RESTSupport.c"
+#line 4462 "RESTSupport.c"
{
SoupMultipart* _tmp6_ = NULL;
PublishingRESTSupportArgument* _tmp7_ = NULL;
@@ -4478,7 +4487,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 4474 "RESTSupport.c"
+#line 4483 "RESTSupport.c"
}
}
}
@@ -4516,7 +4525,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4512 "RESTSupport.c"
+#line 4521 "RESTSupport.c"
goto __catch2_g_file_error;
}
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4531,7 +4540,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4527 "RESTSupport.c"
+#line 4536 "RESTSupport.c"
}
}
goto __finally2;
@@ -4552,7 +4561,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_inner_error_ = _tmp19_;
#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (e);
-#line 4548 "RESTSupport.c"
+#line 4557 "RESTSupport.c"
goto __finally2;
}
__finally2:
@@ -4570,7 +4579,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4566 "RESTSupport.c"
+#line 4575 "RESTSupport.c"
} else {
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
@@ -4584,7 +4593,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4580 "RESTSupport.c"
+#line 4589 "RESTSupport.c"
}
}
#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4602,9 +4611,11 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24__length1 = _tmp23__length1;
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp25_ = payload_length;
+ _tmp25_ = (_tmp24_ != NULL) ? _vala_array_dup2 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0);
+ _tmp25__length1 = _tmp24__length1;
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp26_ = soup_buffer_new_take (_tmp25_, _tmp25__length1);
#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
bindable_data = _tmp26_;
#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4673,7 +4684,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
cont = _tmp49_;
#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4669 "RESTSupport.c"
+#line 4680 "RESTSupport.c"
gboolean _tmp50_ = FALSE;
SoupMessage* _tmp51_ = NULL;
SoupMessageHeaders* _tmp52_ = NULL;
@@ -4691,7 +4702,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
if (!_tmp50_) {
#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4687 "RESTSupport.c"
+#line 4698 "RESTSupport.c"
}
#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp51_ = outbound_message;
@@ -4721,7 +4732,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
_tmp60_ = gee_map_iterator_next (_tmp59_);
#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
cont = _tmp60_;
-#line 4717 "RESTSupport.c"
+#line 4728 "RESTSupport.c"
}
#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp61_ = outbound_message;
@@ -4751,7 +4762,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4747 "RESTSupport.c"
+#line 4758 "RESTSupport.c"
} else {
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
@@ -4771,7 +4782,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
g_clear_error (&_inner_error_);
#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4767 "RESTSupport.c"
+#line 4778 "RESTSupport.c"
}
}
#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4786,7 +4797,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
__vala_SoupMultipart_free0 (message_parts);
#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4782 "RESTSupport.c"
+#line 4793 "RESTSupport.c"
}
@@ -4799,7 +4810,7 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES
((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_upload_transaction_real_add_header;
#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_upload_transaction_real_execute;
-#line 4795 "RESTSupport.c"
+#line 4806 "RESTSupport.c"
}
@@ -4810,7 +4821,7 @@ static void publishing_rest_support_upload_transaction_instance_init (Publishing
self->publishable = NULL;
#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = NULL;
-#line 4806 "RESTSupport.c"
+#line 4817 "RESTSupport.c"
}
@@ -4828,7 +4839,7 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS
_g_object_unref0 (self->message_headers);
#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4824 "RESTSupport.c"
+#line 4835 "RESTSupport.c"
}
@@ -4855,14 +4866,14 @@ static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_co
self->priv->document = _tmp0_;
#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4851 "RESTSupport.c"
+#line 4862 "RESTSupport.c"
}
static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4858 "RESTSupport.c"
+#line 4869 "RESTSupport.c"
}
@@ -4880,7 +4891,7 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
result = _tmp1_;
#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4876 "RESTSupport.c"
+#line 4887 "RESTSupport.c"
}
@@ -4902,21 +4913,21 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
_tmp1_ = _tmp0_->children;
#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
doc_node_iter = _tmp1_;
-#line 4898 "RESTSupport.c"
+#line 4909 "RESTSupport.c"
{
gboolean _tmp2_ = FALSE;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = TRUE;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4905 "RESTSupport.c"
+#line 4916 "RESTSupport.c"
xmlNode* _tmp5_ = NULL;
xmlNode* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp2_) {
-#line 4912 "RESTSupport.c"
+#line 4923 "RESTSupport.c"
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4925,7 +4936,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
_tmp4_ = _tmp3_->next;
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
doc_node_iter = _tmp4_;
-#line 4921 "RESTSupport.c"
+#line 4932 "RESTSupport.c"
}
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = FALSE;
@@ -4935,7 +4946,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
if (!(_tmp5_ != NULL)) {
#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4931 "RESTSupport.c"
+#line 4942 "RESTSupport.c"
}
#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = doc_node_iter;
@@ -4945,7 +4956,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
_tmp8_ = child_name;
#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4941 "RESTSupport.c"
+#line 4952 "RESTSupport.c"
xmlNode* _tmp9_ = NULL;
#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = doc_node_iter;
@@ -4953,7 +4964,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
result = _tmp9_;
#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4949 "RESTSupport.c"
+#line 4960 "RESTSupport.c"
}
}
}
@@ -4969,7 +4980,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
g_propagate_error (error, _inner_error_);
#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4965 "RESTSupport.c"
+#line 4976 "RESTSupport.c"
} else {
#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -4977,7 +4988,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4973 "RESTSupport.c"
+#line 4984 "RESTSupport.c"
}
}
@@ -5006,7 +5017,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
_tmp3_ = value_string;
#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp3_ == NULL) {
-#line 5002 "RESTSupport.c"
+#line 5013 "RESTSupport.c"
const gchar* _tmp4_ = NULL;
xmlNode* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -5029,7 +5040,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
_g_free0 (value_string);
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5025 "RESTSupport.c"
+#line 5036 "RESTSupport.c"
} else {
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
@@ -5039,14 +5050,14 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
g_clear_error (&_inner_error_);
#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5035 "RESTSupport.c"
+#line 5046 "RESTSupport.c"
}
}
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = value_string;
#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5042 "RESTSupport.c"
+#line 5053 "RESTSupport.c"
}
@@ -5069,7 +5080,7 @@ static gchar* string_chug (const gchar* self) {
result = _result_;
#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 5065 "RESTSupport.c"
+#line 5076 "RESTSupport.c"
}
@@ -5092,7 +5103,7 @@ static gchar* string_chomp (const gchar* self) {
result = _result_;
#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 5088 "RESTSupport.c"
+#line 5099 "RESTSupport.c"
}
@@ -5133,7 +5144,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
if (_tmp1_ == NULL) {
#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = TRUE;
-#line 5129 "RESTSupport.c"
+#line 5140 "RESTSupport.c"
} else {
const gchar* _tmp2_ = NULL;
gint _tmp3_ = 0;
@@ -5146,11 +5157,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp4_ = _tmp3_;
#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp4_ == 0;
-#line 5142 "RESTSupport.c"
+#line 5153 "RESTSupport.c"
}
#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 5146 "RESTSupport.c"
+#line 5157 "RESTSupport.c"
GError* _tmp5_ = NULL;
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
@@ -5162,7 +5173,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5158 "RESTSupport.c"
+#line 5169 "RESTSupport.c"
} else {
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5170,7 +5181,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5166 "RESTSupport.c"
+#line 5177 "RESTSupport.c"
}
}
#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5195,7 +5206,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
if (_tmp13_) {
#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = TRUE;
-#line 5191 "RESTSupport.c"
+#line 5202 "RESTSupport.c"
} else {
const gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
@@ -5221,11 +5232,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_g_free0 (_tmp18_);
#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp16_);
-#line 5217 "RESTSupport.c"
+#line 5228 "RESTSupport.c"
}
#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 5221 "RESTSupport.c"
+#line 5232 "RESTSupport.c"
GError* _tmp20_ = NULL;
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5237,7 +5248,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5233 "RESTSupport.c"
+#line 5244 "RESTSupport.c"
} else {
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5245,7 +5256,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5241 "RESTSupport.c"
+#line 5252 "RESTSupport.c"
}
}
#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5264,7 +5275,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp26_ = doc;
#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp26_ == NULL) {
-#line 5260 "RESTSupport.c"
+#line 5271 "RESTSupport.c"
GError* _tmp27_ = NULL;
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5276,7 +5287,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5272 "RESTSupport.c"
+#line 5283 "RESTSupport.c"
} else {
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5284,7 +5295,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5280 "RESTSupport.c"
+#line 5291 "RESTSupport.c"
}
}
#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5293,7 +5304,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp29_ = _tmp28_->children;
#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp29_ == NULL) {
-#line 5289 "RESTSupport.c"
+#line 5300 "RESTSupport.c"
GError* _tmp30_ = NULL;
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5305,7 +5316,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_propagate_error (error, _inner_error_);
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5301 "RESTSupport.c"
+#line 5312 "RESTSupport.c"
} else {
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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);
@@ -5313,7 +5324,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5309 "RESTSupport.c"
+#line 5320 "RESTSupport.c"
}
}
#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5336,7 +5347,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_tmp36_ = _result_;
#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp36_ != NULL) {
-#line 5332 "RESTSupport.c"
+#line 5343 "RESTSupport.c"
const gchar* _tmp37_ = NULL;
GError* _tmp38_ = NULL;
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5355,7 +5366,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_publishing_rest_support_xml_document_unref0 (rest_doc);
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5351 "RESTSupport.c"
+#line 5362 "RESTSupport.c"
} else {
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
@@ -5367,7 +5378,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
g_clear_error (&_inner_error_);
#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5363 "RESTSupport.c"
+#line 5374 "RESTSupport.c"
}
}
#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5376,14 +5387,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
_g_free0 (_result_);
#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5372 "RESTSupport.c"
+#line 5383 "RESTSupport.c"
}
static void publishing_rest_support_value_xml_document_init (GValue* value) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5379 "RESTSupport.c"
+#line 5390 "RESTSupport.c"
}
@@ -5392,7 +5403,7 @@ static void publishing_rest_support_value_xml_document_free_value (GValue* value
if (value->data[0].v_pointer) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5388 "RESTSupport.c"
+#line 5399 "RESTSupport.c"
}
}
@@ -5402,11 +5413,11 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
if (src_value->data[0].v_pointer) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5398 "RESTSupport.c"
+#line 5409 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5402 "RESTSupport.c"
+#line 5413 "RESTSupport.c"
}
}
@@ -5414,37 +5425,37 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5410 "RESTSupport.c"
+#line 5421 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 5417 "RESTSupport.c"
+#line 5428 "RESTSupport.c"
PublishingRESTSupportXmlDocument* object;
object = collect_values[0].v_pointer;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5424 "RESTSupport.c"
+#line 5435 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 5428 "RESTSupport.c"
+#line 5439 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5432 "RESTSupport.c"
+#line 5443 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5436 "RESTSupport.c"
+#line 5447 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5440 "RESTSupport.c"
+#line 5451 "RESTSupport.c"
}
@@ -5455,25 +5466,25 @@ static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GVal
if (!object_p) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5451 "RESTSupport.c"
+#line 5462 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 5457 "RESTSupport.c"
+#line 5468 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 5461 "RESTSupport.c"
+#line 5472 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5465 "RESTSupport.c"
+#line 5476 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5469 "RESTSupport.c"
+#line 5480 "RESTSupport.c"
}
@@ -5487,7 +5498,7 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 5483 "RESTSupport.c"
+#line 5494 "RESTSupport.c"
}
@@ -5496,7 +5507,7 @@ gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5492 "RESTSupport.c"
+#line 5503 "RESTSupport.c"
}
@@ -5516,17 +5527,17 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o
value->data[0].v_pointer = v_object;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5512 "RESTSupport.c"
+#line 5523 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5516 "RESTSupport.c"
+#line 5527 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5522 "RESTSupport.c"
+#line 5533 "RESTSupport.c"
}
}
@@ -5545,17 +5556,17 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 5541 "RESTSupport.c"
+#line 5552 "RESTSupport.c"
} else {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5545 "RESTSupport.c"
+#line 5556 "RESTSupport.c"
}
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5551 "RESTSupport.c"
+#line 5562 "RESTSupport.c"
}
}
@@ -5567,7 +5578,7 @@ static void publishing_rest_support_xml_document_class_init (PublishingRESTSuppo
((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5563 "RESTSupport.c"
+#line 5574 "RESTSupport.c"
}
@@ -5576,7 +5587,7 @@ static void publishing_rest_support_xml_document_instance_init (PublishingRESTSu
self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 5572 "RESTSupport.c"
+#line 5583 "RESTSupport.c"
}
@@ -5591,7 +5602,7 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport
_tmp0_ = self->priv->document;
#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
xmlFreeDoc (_tmp0_);
-#line 5587 "RESTSupport.c"
+#line 5598 "RESTSupport.c"
}
@@ -5616,7 +5627,7 @@ gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 5612 "RESTSupport.c"
+#line 5623 "RESTSupport.c"
}
@@ -5629,7 +5640,7 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5625 "RESTSupport.c"
+#line 5636 "RESTSupport.c"
}
}
@@ -5658,7 +5669,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
current_char = _tmp2_;
#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 5654 "RESTSupport.c"
+#line 5665 "RESTSupport.c"
gint current_char_value = 0;
const gchar* _tmp3_ = NULL;
gunichar _tmp4_ = 0U;
@@ -5682,55 +5693,55 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
if (_tmp5_ < 1) {
#line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5678 "RESTSupport.c"
+#line 5689 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = current_char_value;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp9_ < 128) {
-#line 5684 "RESTSupport.c"
+#line 5695 "RESTSupport.c"
gint _tmp10_ = 0;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = current_char_value;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5690 "RESTSupport.c"
+#line 5701 "RESTSupport.c"
} else {
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = FALSE;
-#line 5694 "RESTSupport.c"
+#line 5705 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_) {
-#line 5698 "RESTSupport.c"
+#line 5709 "RESTSupport.c"
gint _tmp11_ = 0;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = current_char_value;
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5704 "RESTSupport.c"
+#line 5715 "RESTSupport.c"
} else {
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = FALSE;
-#line 5708 "RESTSupport.c"
+#line 5719 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp7_) {
-#line 5712 "RESTSupport.c"
+#line 5723 "RESTSupport.c"
gint _tmp12_ = 0;
#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = current_char_value;
#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5718 "RESTSupport.c"
+#line 5729 "RESTSupport.c"
} else {
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = FALSE;
-#line 5722 "RESTSupport.c"
+#line 5733 "RESTSupport.c"
}
#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 5726 "RESTSupport.c"
+#line 5737 "RESTSupport.c"
GString* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
gunichar _tmp15_ = 0U;
@@ -5742,7 +5753,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5738 "RESTSupport.c"
+#line 5749 "RESTSupport.c"
} else {
GString* _tmp16_ = NULL;
gint _tmp17_ = 0;
@@ -5760,7 +5771,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
g_string_append (_tmp16_, _tmp19_);
#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp19_);
-#line 5756 "RESTSupport.c"
+#line 5767 "RESTSupport.c"
}
#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = current_char;
@@ -5772,7 +5783,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
_g_free0 (current_char);
#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
current_char = _tmp22_;
-#line 5768 "RESTSupport.c"
+#line 5779 "RESTSupport.c"
}
#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = encoded_str_builder;
@@ -5788,28 +5799,28 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
_g_string_free0 (encoded_str_builder);
#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5784 "RESTSupport.c"
+#line 5795 "RESTSupport.c"
}
-static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
SpitPublishingPublishable** result;
int i;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 5795 "RESTSupport.c"
+#line 5806 "RESTSupport.c"
SpitPublishingPublishable* _tmp0_ = NULL;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 5801 "RESTSupport.c"
+#line 5812 "RESTSupport.c"
}
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5805 "RESTSupport.c"
+#line 5816 "RESTSupport.c"
}
@@ -5830,7 +5841,7 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = publishables_length1;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+ _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = _tmp0__length1;
#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5851,14 +5862,14 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
self->priv->session = _tmp3_;
#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 5847 "RESTSupport.c"
+#line 5858 "RESTSupport.c"
}
static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5854 "RESTSupport.c"
+#line 5865 "RESTSupport.c"
}
@@ -5878,7 +5889,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp0_ = self->priv->publishables;
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 5874 "RESTSupport.c"
+#line 5885 "RESTSupport.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
@@ -5890,14 +5901,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
publishable_collection_length1 = _tmp0__length1;
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5886 "RESTSupport.c"
+#line 5897 "RESTSupport.c"
SpitPublishingPublishable* _tmp1_ = NULL;
SpitPublishingPublishable* publishable = NULL;
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable = _tmp1_;
-#line 5893 "RESTSupport.c"
+#line 5904 "RESTSupport.c"
{
GFile* file = NULL;
SpitPublishingPublishable* _tmp2_ = NULL;
@@ -5930,7 +5941,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp4_ = file;
#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp4_ == NULL) {
-#line 5926 "RESTSupport.c"
+#line 5937 "RESTSupport.c"
gint _tmp5_ = 0;
#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->current_file;
@@ -5942,7 +5953,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
continue;
-#line 5938 "RESTSupport.c"
+#line 5949 "RESTSupport.c"
}
#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->current_file;
@@ -5958,7 +5969,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp8__target = self->priv->status_updated_target;
#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 5954 "RESTSupport.c"
+#line 5965 "RESTSupport.c"
SpitPublishingProgressCallback _tmp9_ = NULL;
void* _tmp9__target = NULL;
gint _tmp10_ = 0;
@@ -5973,7 +5984,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp11_ = fraction_complete;
#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5969 "RESTSupport.c"
+#line 5980 "RESTSupport.c"
}
#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = self->priv->publishables;
@@ -5991,7 +6002,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp16_ = txn;
#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5987 "RESTSupport.c"
+#line 5998 "RESTSupport.c"
{
PublishingRESTSupportTransaction* _tmp17_ = NULL;
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6002,7 +6013,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5998 "RESTSupport.c"
+#line 6009 "RESTSupport.c"
goto __catch3_spit_publishing_publishing_error;
}
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6017,7 +6028,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6013 "RESTSupport.c"
+#line 6024 "RESTSupport.c"
}
}
goto __finally3;
@@ -6037,7 +6048,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
stop = TRUE;
#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 6033 "RESTSupport.c"
+#line 6044 "RESTSupport.c"
}
__finally3:
#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6054,7 +6065,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6050 "RESTSupport.c"
+#line 6061 "RESTSupport.c"
}
#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = txn;
@@ -6074,7 +6085,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (publishable);
#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6070 "RESTSupport.c"
+#line 6081 "RESTSupport.c"
}
#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = self->priv->current_file;
@@ -6086,7 +6097,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_g_object_unref0 (file);
#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 6082 "RESTSupport.c"
+#line 6093 "RESTSupport.c"
}
}
}
@@ -6094,13 +6105,13 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
_tmp23_ = stop;
#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp23_) {
-#line 6090 "RESTSupport.c"
+#line 6101 "RESTSupport.c"
gint _tmp24_ = 0;
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = self->priv->current_file;
#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "upload-complete", _tmp24_);
-#line 6096 "RESTSupport.c"
+#line 6107 "RESTSupport.c"
}
}
@@ -6149,7 +6160,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
_tmp7__target = self->priv->status_updated_target;
#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp7_ != NULL) {
-#line 6145 "RESTSupport.c"
+#line 6156 "RESTSupport.c"
SpitPublishingProgressCallback _tmp8_ = NULL;
void* _tmp8__target = NULL;
gint _tmp9_ = 0;
@@ -6164,7 +6175,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
_tmp10_ = fraction_complete;
#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 6160 "RESTSupport.c"
+#line 6171 "RESTSupport.c"
}
}
@@ -6183,7 +6194,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
result = _tmp1_;
#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6179 "RESTSupport.c"
+#line 6190 "RESTSupport.c"
}
@@ -6210,7 +6221,7 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
result = _tmp3_;
#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6206 "RESTSupport.c"
+#line 6217 "RESTSupport.c"
}
@@ -6219,7 +6230,7 @@ static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6215 "RESTSupport.c"
+#line 6226 "RESTSupport.c"
}
@@ -6228,7 +6239,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6224 "RESTSupport.c"
+#line 6235 "RESTSupport.c"
}
@@ -6255,7 +6266,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
if (_tmp1__length1 > 0) {
#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_send_files (self);
-#line 6251 "RESTSupport.c"
+#line 6262 "RESTSupport.c"
}
}
@@ -6263,7 +6274,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6259 "RESTSupport.c"
+#line 6270 "RESTSupport.c"
}
@@ -6272,7 +6283,7 @@ static void publishing_rest_support_value_batch_uploader_free_value (GValue* val
if (value->data[0].v_pointer) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6268 "RESTSupport.c"
+#line 6279 "RESTSupport.c"
}
}
@@ -6282,11 +6293,11 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
if (src_value->data[0].v_pointer) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 6278 "RESTSupport.c"
+#line 6289 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6282 "RESTSupport.c"
+#line 6293 "RESTSupport.c"
}
}
@@ -6294,37 +6305,37 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6290 "RESTSupport.c"
+#line 6301 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 6297 "RESTSupport.c"
+#line 6308 "RESTSupport.c"
PublishingRESTSupportBatchUploader* object;
object = collect_values[0].v_pointer;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6304 "RESTSupport.c"
+#line 6315 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 6308 "RESTSupport.c"
+#line 6319 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6312 "RESTSupport.c"
+#line 6323 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6316 "RESTSupport.c"
+#line 6327 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6320 "RESTSupport.c"
+#line 6331 "RESTSupport.c"
}
@@ -6335,25 +6346,25 @@ static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GV
if (!object_p) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6331 "RESTSupport.c"
+#line 6342 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 6337 "RESTSupport.c"
+#line 6348 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 6341 "RESTSupport.c"
+#line 6352 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6345 "RESTSupport.c"
+#line 6356 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6349 "RESTSupport.c"
+#line 6360 "RESTSupport.c"
}
@@ -6367,7 +6378,7 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name
G_PARAM_SPEC (spec)->value_type = object_type;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 6363 "RESTSupport.c"
+#line 6374 "RESTSupport.c"
}
@@ -6376,7 +6387,7 @@ gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value)
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6372 "RESTSupport.c"
+#line 6383 "RESTSupport.c"
}
@@ -6396,17 +6407,17 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v
value->data[0].v_pointer = v_object;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6392 "RESTSupport.c"
+#line 6403 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6396 "RESTSupport.c"
+#line 6407 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6402 "RESTSupport.c"
+#line 6413 "RESTSupport.c"
}
}
@@ -6425,17 +6436,17 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 6421 "RESTSupport.c"
+#line 6432 "RESTSupport.c"
} else {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6425 "RESTSupport.c"
+#line 6436 "RESTSupport.c"
}
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6431 "RESTSupport.c"
+#line 6442 "RESTSupport.c"
}
}
@@ -6453,7 +6464,7 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup
g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6449 "RESTSupport.c"
+#line 6460 "RESTSupport.c"
}
@@ -6474,7 +6485,7 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST
self->priv->status_updated = NULL;
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 6470 "RESTSupport.c"
+#line 6481 "RESTSupport.c"
}
@@ -6488,7 +6499,7 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6484 "RESTSupport.c"
+#line 6495 "RESTSupport.c"
}
@@ -6513,7 +6524,7 @@ gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 6509 "RESTSupport.c"
+#line 6520 "RESTSupport.c"
}
@@ -6526,7 +6537,7 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6522 "RESTSupport.c"
+#line 6533 "RESTSupport.c"
}
}
@@ -6545,7 +6556,7 @@ static gunichar string_get_char (const gchar* self, glong index) {
result = _tmp1_;
#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6541 "RESTSupport.c"
+#line 6552 "RESTSupport.c"
}
@@ -6571,7 +6582,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp2_ = g_string_new ("");
#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
b = _tmp2_;
-#line 6567 "RESTSupport.c"
+#line 6578 "RESTSupport.c"
{
const gchar* u = NULL;
const gchar* _tmp3_ = NULL;
@@ -6579,14 +6590,14 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp3_ = t;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
u = _tmp3_;
-#line 6575 "RESTSupport.c"
+#line 6586 "RESTSupport.c"
{
gboolean _tmp4_ = FALSE;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = TRUE;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 6582 "RESTSupport.c"
+#line 6593 "RESTSupport.c"
const gchar* _tmp7_ = NULL;
gunichar _tmp8_ = 0U;
gunichar c = 0U;
@@ -6595,7 +6606,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
gunichar _tmp11_ = 0U;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 6591 "RESTSupport.c"
+#line 6602 "RESTSupport.c"
const gchar* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6604,7 +6615,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp6_ = g_utf8_next_char (_tmp5_);
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
u = _tmp6_;
-#line 6600 "RESTSupport.c"
+#line 6611 "RESTSupport.c"
}
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = FALSE;
@@ -6616,7 +6627,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
if (!(_tmp8_ != ((gunichar) 0))) {
#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6612 "RESTSupport.c"
+#line 6623 "RESTSupport.c"
}
#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = u;
@@ -6628,7 +6639,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp11_ = c;
#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (((gint) _tmp11_) < 128) {
-#line 6624 "RESTSupport.c"
+#line 6635 "RESTSupport.c"
GString* _tmp12_ = NULL;
gunichar _tmp13_ = 0U;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6637,7 +6648,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_tmp13_ = c;
#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6633 "RESTSupport.c"
+#line 6644 "RESTSupport.c"
}
}
}
@@ -6656,7 +6667,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
_g_free0 (t);
#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6652 "RESTSupport.c"
+#line 6663 "RESTSupport.c"
}
@@ -6665,7 +6676,7 @@ static gchar* publishing_rest_support_google_session_real_get_user_name (Publish
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6661 "RESTSupport.c"
+#line 6672 "RESTSupport.c"
}
@@ -6674,7 +6685,7 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6670 "RESTSupport.c"
+#line 6681 "RESTSupport.c"
}
@@ -6683,7 +6694,7 @@ static gchar* publishing_rest_support_google_session_real_get_access_token (Publ
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6679 "RESTSupport.c"
+#line 6690 "RESTSupport.c"
}
@@ -6692,7 +6703,7 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6688 "RESTSupport.c"
+#line 6699 "RESTSupport.c"
}
@@ -6701,7 +6712,7 @@ static gchar* publishing_rest_support_google_session_real_get_refresh_token (Pub
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_refresh_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6697 "RESTSupport.c"
+#line 6708 "RESTSupport.c"
}
@@ -6710,7 +6721,7 @@ gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTS
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_refresh_token (self);
-#line 6706 "RESTSupport.c"
+#line 6717 "RESTSupport.c"
}
@@ -6719,7 +6730,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6715 "RESTSupport.c"
+#line 6726 "RESTSupport.c"
}
@@ -6728,7 +6739,7 @@ void publishing_rest_support_google_session_deauthenticate (PublishingRESTSuppor
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6724 "RESTSupport.c"
+#line 6735 "RESTSupport.c"
}
@@ -6738,7 +6749,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const
self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6734 "RESTSupport.c"
+#line 6745 "RESTSupport.c"
}
@@ -6753,7 +6764,7 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup
((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_session_real_get_refresh_token;
#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_session_real_deauthenticate;
-#line 6749 "RESTSupport.c"
+#line 6760 "RESTSupport.c"
}
@@ -6816,14 +6827,14 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
self->priv->web_auth_pane = NULL;
#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6812 "RESTSupport.c"
+#line 6823 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized (PublishingRESTSupportGooglePublisherWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_web_auth_pane_authorized ((PublishingRESTSupportGooglePublisher*) self, auth_code);
-#line 6819 "RESTSupport.c"
+#line 6830 "RESTSupport.c"
}
@@ -6857,27 +6868,27 @@ static void publishing_rest_support_google_publisher_on_web_auth_pane_authorized
if (!_tmp4_) {
#line 895 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6852 "RESTSupport.c"
+#line 6863 "RESTSupport.c"
}
#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = auth_code;
#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_get_access_tokens (self, _tmp5_);
-#line 6858 "RESTSupport.c"
+#line 6869 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_get_access_tokens_complete ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6865 "RESTSupport.c"
+#line 6876 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_get_access_tokens_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6872 "RESTSupport.c"
+#line 6883 "RESTSupport.c"
}
@@ -6915,7 +6926,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
if (!_tmp4_) {
#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6909 "RESTSupport.c"
+#line 6920 "RESTSupport.c"
}
#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = txn;
@@ -6927,7 +6938,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp7_);
#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 6921 "RESTSupport.c"
+#line 6932 "RESTSupport.c"
}
@@ -6975,7 +6986,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
if (!_tmp7_) {
#line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6968 "RESTSupport.c"
+#line 6979 "RESTSupport.c"
}
#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->host;
@@ -6983,21 +6994,21 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
_tmp9_ = err;
#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 6976 "RESTSupport.c"
+#line 6987 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6983 "RESTSupport.c"
+#line 6994 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6990 "RESTSupport.c"
+#line 7001 "RESTSupport.c"
}
@@ -7037,7 +7048,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (!_tmp4_) {
#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7029 "RESTSupport.c"
+#line 7040 "RESTSupport.c"
}
#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->session;
@@ -7047,7 +7058,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (_tmp6_) {
#line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7039 "RESTSupport.c"
+#line 7050 "RESTSupport.c"
}
#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = txn;
@@ -7059,7 +7070,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp9_);
#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp9_);
-#line 7051 "RESTSupport.c"
+#line 7062 "RESTSupport.c"
}
@@ -7100,7 +7111,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (!_tmp4_) {
#line 951 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7091 "RESTSupport.c"
+#line 7102 "RESTSupport.c"
}
#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->session;
@@ -7110,7 +7121,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
if (_tmp6_) {
#line 954 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7101 "RESTSupport.c"
+#line 7112 "RESTSupport.c"
}
#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = txn;
@@ -7122,7 +7133,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
publishing_rest_support_google_publisher_do_logout (self);
#line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7113 "RESTSupport.c"
+#line 7124 "RESTSupport.c"
}
#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->host;
@@ -7130,7 +7141,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
_tmp10_ = err;
#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp9_, _tmp10_);
-#line 7121 "RESTSupport.c"
+#line 7132 "RESTSupport.c"
}
@@ -7155,7 +7166,7 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
if (!_tmp1_) {
#line 970 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7145 "RESTSupport.c"
+#line 7156 "RESTSupport.c"
}
#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->session;
@@ -7167,7 +7178,7 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
_g_free0 (_tmp2_->refresh_token);
#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_->refresh_token = _tmp4_;
-#line 7157 "RESTSupport.c"
+#line 7168 "RESTSupport.c"
}
@@ -7192,7 +7203,7 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
if (!_tmp1_) {
#line 979 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7181 "RESTSupport.c"
+#line 7192 "RESTSupport.c"
}
#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->session;
@@ -7206,21 +7217,21 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
_tmp2_->access_token = _tmp4_;
#line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_fetch_username (self);
-#line 7195 "RESTSupport.c"
+#line 7206 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_fetch_username_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 7202 "RESTSupport.c"
+#line 7213 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_fetch_username_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 7209 "RESTSupport.c"
+#line 7220 "RESTSupport.c"
}
@@ -7258,7 +7269,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
if (!_tmp4_) {
#line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7246 "RESTSupport.c"
+#line 7257 "RESTSupport.c"
}
#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = txn;
@@ -7270,7 +7281,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
publishing_rest_support_google_publisher_do_extract_username (self, _tmp7_);
#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 7258 "RESTSupport.c"
+#line 7269 "RESTSupport.c"
}
@@ -7307,7 +7318,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
if (!_tmp4_) {
#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7294 "RESTSupport.c"
+#line 7305 "RESTSupport.c"
}
#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->host;
@@ -7315,7 +7326,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
_tmp6_ = err;
#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 7302 "RESTSupport.c"
+#line 7313 "RESTSupport.c"
}
@@ -7349,7 +7360,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
#line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7335 "RESTSupport.c"
+#line 7346 "RESTSupport.c"
{
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7357,7 +7368,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7343 "RESTSupport.c"
+#line 7354 "RESTSupport.c"
goto __catch4_spit_publishing_publishing_error;
}
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7368,7 +7379,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
g_clear_error (&_inner_error_);
#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7354 "RESTSupport.c"
+#line 7365 "RESTSupport.c"
}
}
goto __finally4;
@@ -7389,7 +7400,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7375 "RESTSupport.c"
+#line 7386 "RESTSupport.c"
}
__finally4:
#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7402,11 +7413,11 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
g_clear_error (&_inner_error_);
#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7388 "RESTSupport.c"
+#line 7399 "RESTSupport.c"
}
#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 7392 "RESTSupport.c"
+#line 7403 "RESTSupport.c"
}
@@ -7546,7 +7557,7 @@ static void publishing_rest_support_google_publisher_do_hosted_web_authenticatio
spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (user_authorization_url);
-#line 7531 "RESTSupport.c"
+#line 7542 "RESTSupport.c"
}
@@ -7575,7 +7586,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
#line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7559 "RESTSupport.c"
+#line 7570 "RESTSupport.c"
{
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7583,7 +7594,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7567 "RESTSupport.c"
+#line 7578 "RESTSupport.c"
goto __catch5_spit_publishing_publishing_error;
}
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7594,7 +7605,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
g_clear_error (&_inner_error_);
#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7578 "RESTSupport.c"
+#line 7589 "RESTSupport.c"
}
}
goto __finally5;
@@ -7615,7 +7626,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7599 "RESTSupport.c"
+#line 7610 "RESTSupport.c"
}
__finally5:
#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7628,18 +7639,18 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
g_clear_error (&_inner_error_);
#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7612 "RESTSupport.c"
+#line 7623 "RESTSupport.c"
}
#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 7616 "RESTSupport.c"
+#line 7627 "RESTSupport.c"
}
static gpointer _json_object_ref0 (gpointer self) {
#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? json_object_ref (self) : NULL;
-#line 7623 "RESTSupport.c"
+#line 7634 "RESTSupport.c"
}
@@ -7670,7 +7681,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp0_ = json_parser_new ();
#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
parser = _tmp0_;
-#line 7653 "RESTSupport.c"
+#line 7664 "RESTSupport.c"
{
JsonParser* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
@@ -7682,7 +7693,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7665 "RESTSupport.c"
+#line 7676 "RESTSupport.c"
goto __catch6_g_error;
}
}
@@ -7727,7 +7738,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_g_object_unref0 (parser);
#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7710 "RESTSupport.c"
+#line 7721 "RESTSupport.c"
}
__finally6:
#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7740,7 +7751,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
g_clear_error (&_inner_error_);
#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7723 "RESTSupport.c"
+#line 7734 "RESTSupport.c"
}
#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = parser;
@@ -7758,7 +7769,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp16_ = json_object_has_member (_tmp15_, "access_token");
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp16_) {
-#line 7741 "RESTSupport.c"
+#line 7752 "RESTSupport.c"
JsonObject* _tmp17_ = NULL;
gboolean _tmp18_ = FALSE;
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7767,15 +7778,15 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = !_tmp18_;
-#line 7750 "RESTSupport.c"
+#line 7761 "RESTSupport.c"
} else {
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = FALSE;
-#line 7754 "RESTSupport.c"
+#line 7765 "RESTSupport.c"
}
#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp14_) {
-#line 7758 "RESTSupport.c"
+#line 7769 "RESTSupport.c"
SpitPublishingPluginHost* _tmp19_ = NULL;
GError* _tmp20_ = NULL;
GError* _tmp21_ = NULL;
@@ -7795,7 +7806,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_g_object_unref0 (parser);
#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7778 "RESTSupport.c"
+#line 7789 "RESTSupport.c"
}
#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = response_obj;
@@ -7803,7 +7814,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp23_ = json_object_has_member (_tmp22_, "refresh_token");
#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp23_) {
-#line 7786 "RESTSupport.c"
+#line 7797 "RESTSupport.c"
gchar* refresh_token = NULL;
JsonObject* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
@@ -7821,17 +7832,17 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp27_ = refresh_token;
#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 7804 "RESTSupport.c"
+#line 7815 "RESTSupport.c"
const gchar* _tmp28_ = NULL;
#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = refresh_token;
#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_token_available (self, _tmp28_);
-#line 7810 "RESTSupport.c"
+#line 7821 "RESTSupport.c"
}
#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (refresh_token);
-#line 7814 "RESTSupport.c"
+#line 7825 "RESTSupport.c"
}
#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = response_obj;
@@ -7839,7 +7850,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp30_ = json_object_has_member (_tmp29_, "access_token");
#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp30_) {
-#line 7822 "RESTSupport.c"
+#line 7833 "RESTSupport.c"
gchar* access_token = NULL;
JsonObject* _tmp31_ = NULL;
const gchar* _tmp32_ = NULL;
@@ -7857,23 +7868,23 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
_tmp34_ = access_token;
#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 7840 "RESTSupport.c"
+#line 7851 "RESTSupport.c"
const gchar* _tmp35_ = NULL;
#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = access_token;
#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_access_token_available (self, _tmp35_);
-#line 7846 "RESTSupport.c"
+#line 7857 "RESTSupport.c"
}
#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (access_token);
-#line 7850 "RESTSupport.c"
+#line 7861 "RESTSupport.c"
}
#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_json_object_unref0 (response_obj);
#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 7856 "RESTSupport.c"
+#line 7867 "RESTSupport.c"
}
@@ -7907,13 +7918,13 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
#line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7889 "RESTSupport.c"
+#line 7900 "RESTSupport.c"
{
#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7895 "RESTSupport.c"
+#line 7906 "RESTSupport.c"
goto __catch7_g_error;
}
}
@@ -7935,7 +7946,7 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7917 "RESTSupport.c"
+#line 7928 "RESTSupport.c"
}
__finally7:
#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7948,11 +7959,11 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
g_clear_error (&_inner_error_);
#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7930 "RESTSupport.c"
+#line 7941 "RESTSupport.c"
}
#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 7934 "RESTSupport.c"
+#line 7945 "RESTSupport.c"
}
@@ -7982,7 +7993,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp0_ = json_parser_new ();
#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
parser = _tmp0_;
-#line 7963 "RESTSupport.c"
+#line 7974 "RESTSupport.c"
{
JsonParser* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
@@ -7994,7 +8005,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7975 "RESTSupport.c"
+#line 7986 "RESTSupport.c"
goto __catch8_g_error;
}
}
@@ -8039,7 +8050,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_g_object_unref0 (parser);
#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8020 "RESTSupport.c"
+#line 8031 "RESTSupport.c"
}
__finally8:
#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8052,7 +8063,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
g_clear_error (&_inner_error_);
#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8033 "RESTSupport.c"
+#line 8044 "RESTSupport.c"
}
#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = parser;
@@ -8070,7 +8081,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp15_ = json_object_has_member (_tmp14_, "name");
#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp15_) {
-#line 8051 "RESTSupport.c"
+#line 8062 "RESTSupport.c"
gchar* username = NULL;
JsonObject* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
@@ -8088,7 +8099,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp19_ = username;
#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 8069 "RESTSupport.c"
+#line 8080 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
gchar* _tmp22_ = NULL;
@@ -8102,11 +8113,11 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_g_free0 (_tmp20_->user_name);
#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_->user_name = _tmp22_;
-#line 8083 "RESTSupport.c"
+#line 8094 "RESTSupport.c"
}
#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (username);
-#line 8087 "RESTSupport.c"
+#line 8098 "RESTSupport.c"
}
#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = response_obj;
@@ -8114,7 +8125,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp24_ = json_object_has_member (_tmp23_, "access_token");
#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp24_) {
-#line 8095 "RESTSupport.c"
+#line 8106 "RESTSupport.c"
gchar* access_token = NULL;
JsonObject* _tmp25_ = NULL;
const gchar* _tmp26_ = NULL;
@@ -8132,7 +8143,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_tmp28_ = access_token;
#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp28_, "") != 0) {
-#line 8113 "RESTSupport.c"
+#line 8124 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp29_ = NULL;
const gchar* _tmp30_ = NULL;
gchar* _tmp31_ = NULL;
@@ -8146,11 +8157,11 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_g_free0 (_tmp29_->access_token);
#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_->access_token = _tmp31_;
-#line 8127 "RESTSupport.c"
+#line 8138 "RESTSupport.c"
}
#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (access_token);
-#line 8131 "RESTSupport.c"
+#line 8142 "RESTSupport.c"
}
#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = self->priv->session;
@@ -8164,7 +8175,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
_json_object_unref0 (response_obj);
#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 8145 "RESTSupport.c"
+#line 8156 "RESTSupport.c"
}
@@ -8179,7 +8190,7 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub
result = _tmp0_;
#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8160 "RESTSupport.c"
+#line 8171 "RESTSupport.c"
}
@@ -8197,7 +8208,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
result = _tmp1_;
#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8178 "RESTSupport.c"
+#line 8189 "RESTSupport.c"
}
@@ -8210,21 +8221,21 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
_tmp1_ = refresh_token;
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 8191 "RESTSupport.c"
+#line 8202 "RESTSupport.c"
const gchar* _tmp2_ = NULL;
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = refresh_token;
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strcmp0 (_tmp2_, "") != 0;
-#line 8197 "RESTSupport.c"
+#line 8208 "RESTSupport.c"
} else {
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = FALSE;
-#line 8201 "RESTSupport.c"
+#line 8212 "RESTSupport.c"
}
#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 8205 "RESTSupport.c"
+#line 8216 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
@@ -8240,14 +8251,14 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
_tmp3_->refresh_token = _tmp5_;
#line 1164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (self);
-#line 8221 "RESTSupport.c"
+#line 8232 "RESTSupport.c"
} else {
gboolean _tmp6_ = FALSE;
#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty ();
#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 8228 "RESTSupport.c"
+#line 8239 "RESTSupport.c"
SpitPublishingPluginHost* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8262,11 +8273,11 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp8_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
#line 1168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8239 "RESTSupport.c"
+#line 8250 "RESTSupport.c"
}
#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_hosted_web_authentication (self);
-#line 8243 "RESTSupport.c"
+#line 8254 "RESTSupport.c"
}
}
@@ -8276,7 +8287,7 @@ static void publishing_rest_support_google_publisher_real_on_login_flow_complete
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8253 "RESTSupport.c"
+#line 8264 "RESTSupport.c"
}
@@ -8285,7 +8296,7 @@ void publishing_rest_support_google_publisher_on_login_flow_complete (Publishing
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 8262 "RESTSupport.c"
+#line 8273 "RESTSupport.c"
}
@@ -8294,7 +8305,7 @@ static void publishing_rest_support_google_publisher_real_do_logout (PublishingR
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8271 "RESTSupport.c"
+#line 8282 "RESTSupport.c"
}
@@ -8303,7 +8314,7 @@ void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGo
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 8280 "RESTSupport.c"
+#line 8291 "RESTSupport.c"
}
@@ -8312,7 +8323,7 @@ static gboolean publishing_rest_support_google_publisher_real_is_running (Publis
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return FALSE;
-#line 8289 "RESTSupport.c"
+#line 8300 "RESTSupport.c"
}
@@ -8321,7 +8332,7 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 8298 "RESTSupport.c"
+#line 8309 "RESTSupport.c"
}
@@ -8330,7 +8341,7 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8307 "RESTSupport.c"
+#line 8318 "RESTSupport.c"
}
@@ -8339,7 +8350,7 @@ void publishing_rest_support_google_publisher_start (PublishingRESTSupportGoogle
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 8316 "RESTSupport.c"
+#line 8327 "RESTSupport.c"
}
@@ -8348,7 +8359,7 @@ static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSu
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8325 "RESTSupport.c"
+#line 8336 "RESTSupport.c"
}
@@ -8357,7 +8368,7 @@ void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGoogleP
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 8334 "RESTSupport.c"
+#line 8345 "RESTSupport.c"
}
@@ -8376,7 +8387,7 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
result = _tmp1_;
#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8353 "RESTSupport.c"
+#line 8364 "RESTSupport.c"
}
@@ -8398,14 +8409,14 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su
self->refresh_token = NULL;
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8375 "RESTSupport.c"
+#line 8386 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 8382 "RESTSupport.c"
+#line 8393 "RESTSupport.c"
}
@@ -8421,7 +8432,7 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
result = _tmp0_ != NULL;
#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8398 "RESTSupport.c"
+#line 8409 "RESTSupport.c"
}
@@ -8445,7 +8456,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8422 "RESTSupport.c"
+#line 8433 "RESTSupport.c"
}
@@ -8469,7 +8480,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8446 "RESTSupport.c"
+#line 8457 "RESTSupport.c"
}
@@ -8493,7 +8504,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
result = _tmp2_;
#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8470 "RESTSupport.c"
+#line 8481 "RESTSupport.c"
}
@@ -8513,7 +8524,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de
_g_free0 (self->refresh_token);
#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 8490 "RESTSupport.c"
+#line 8501 "RESTSupport.c"
}
@@ -8532,7 +8543,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i
((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token;
#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 8509 "RESTSupport.c"
+#line 8520 "RESTSupport.c"
}
@@ -8552,7 +8563,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz
_g_free0 (self->refresh_token);
#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 8529 "RESTSupport.c"
+#line 8540 "RESTSupport.c"
}
@@ -8579,14 +8590,14 @@ static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_res
self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8556 "RESTSupport.c"
+#line 8567 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_web_authentication_pane_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 8563 "RESTSupport.c"
+#line 8574 "RESTSupport.c"
}
@@ -8599,7 +8610,7 @@ static gboolean publishing_rest_support_google_publisher_web_authentication_pane
result = _tmp0_;
#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8576 "RESTSupport.c"
+#line 8587 "RESTSupport.c"
}
@@ -8626,7 +8637,7 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
_tmp3_ = _result_;
#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
-#line 8603 "RESTSupport.c"
+#line 8614 "RESTSupport.c"
gchar* _tmp4_ = NULL;
#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
@@ -8634,13 +8645,13 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
result = (gint) (_tmp4_ - ((gchar*) self));
#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8611 "RESTSupport.c"
+#line 8622 "RESTSupport.c"
} else {
#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8617 "RESTSupport.c"
+#line 8628 "RESTSupport.c"
}
}
@@ -8664,7 +8675,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 8641 "RESTSupport.c"
+#line 8652 "RESTSupport.c"
glong _tmp4_ = 0L;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -8672,7 +8683,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 8649 "RESTSupport.c"
+#line 8660 "RESTSupport.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -8684,7 +8695,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 8661 "RESTSupport.c"
+#line 8672 "RESTSupport.c"
}
}
@@ -8708,21 +8719,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 8685 "RESTSupport.c"
+#line 8696 "RESTSupport.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 8691 "RESTSupport.c"
+#line 8702 "RESTSupport.c"
} else {
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 8695 "RESTSupport.c"
+#line 8706 "RESTSupport.c"
}
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 8699 "RESTSupport.c"
+#line 8710 "RESTSupport.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
@@ -8734,7 +8745,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 8711 "RESTSupport.c"
+#line 8722 "RESTSupport.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -8744,13 +8755,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 8721 "RESTSupport.c"
+#line 8732 "RESTSupport.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 8727 "RESTSupport.c"
+#line 8738 "RESTSupport.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
@@ -8764,7 +8775,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 8741 "RESTSupport.c"
+#line 8752 "RESTSupport.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
@@ -8774,13 +8785,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 8751 "RESTSupport.c"
+#line 8762 "RESTSupport.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 8757 "RESTSupport.c"
+#line 8768 "RESTSupport.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8789,7 +8800,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 8766 "RESTSupport.c"
+#line 8777 "RESTSupport.c"
}
#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -8809,7 +8820,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 8786 "RESTSupport.c"
+#line 8797 "RESTSupport.c"
}
@@ -8845,7 +8856,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_ > 0) {
-#line 8822 "RESTSupport.c"
+#line 8833 "RESTSupport.c"
gint auth_code_field_start = 0;
const gchar* _tmp7_ = NULL;
gint _tmp8_ = 0;
@@ -8869,7 +8880,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
_g_free0 (page_title);
#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8846 "RESTSupport.c"
+#line 8857 "RESTSupport.c"
}
#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = page_title;
@@ -8887,11 +8898,11 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
g_signal_emit_by_name (self, "authorized", _tmp13_);
#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (auth_code);
-#line 8864 "RESTSupport.c"
+#line 8875 "RESTSupport.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (page_title);
-#line 8868 "RESTSupport.c"
+#line 8879 "RESTSupport.c"
}
@@ -8904,7 +8915,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_cla
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_web_authentication_pane_finalize;
#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 8881 "RESTSupport.c"
+#line 8892 "RESTSupport.c"
}
@@ -8918,7 +8929,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_fin
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_web_authentication_pane_parent_class)->finalize (obj);
-#line 8895 "RESTSupport.c"
+#line 8906 "RESTSupport.c"
}
@@ -8960,21 +8971,21 @@ static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishin
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8937 "RESTSupport.c"
+#line 8948 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_new (PublishingRESTSupportSession* session, const gchar* auth_code) {
#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 8944 "RESTSupport.c"
+#line 8955 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_get_access_tokens_transaction_class_init (PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass * klass) {
#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8951 "RESTSupport.c"
+#line 8962 "RESTSupport.c"
}
@@ -9024,21 +9035,21 @@ static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publis
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9001 "RESTSupport.c"
+#line 9012 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_new (PublishingRESTSupportSession* session) {
#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 9008 "RESTSupport.c"
+#line 9019 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_refresh_access_token_transaction_class_init (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass * klass) {
#line 838 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9015 "RESTSupport.c"
+#line 9026 "RESTSupport.c"
}
@@ -9077,14 +9088,14 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) 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 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9054 "RESTSupport.c"
+#line 9065 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9061 "RESTSupport.c"
+#line 9072 "RESTSupport.c"
}
@@ -9136,21 +9147,21 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
_g_free0 (_tmp7_);
#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9113 "RESTSupport.c"
+#line 9124 "RESTSupport.c"
}
PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9120 "RESTSupport.c"
+#line 9131 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9127 "RESTSupport.c"
+#line 9138 "RESTSupport.c"
}
@@ -9181,21 +9192,21 @@ static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_
self = (PublishingRESTSupportGooglePublisherUsernameFetchTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9158 "RESTSupport.c"
+#line 9169 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_new (PublishingRESTSupportGoogleSession* session) {
#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_username_fetch_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 9165 "RESTSupport.c"
+#line 9176 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_username_fetch_transaction_class_init (PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass * klass) {
#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9172 "RESTSupport.c"
+#line 9183 "RESTSupport.c"
}
@@ -9232,7 +9243,7 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS
((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_rest_support_google_publisher_real_stop;
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 9209 "RESTSupport.c"
+#line 9220 "RESTSupport.c"
}
@@ -9247,14 +9258,14 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i
iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop;
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service;
-#line 9224 "RESTSupport.c"
+#line 9235 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 9231 "RESTSupport.c"
+#line 9242 "RESTSupport.c"
}
@@ -9270,7 +9281,7 @@ static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
_g_object_unref0 (self->priv->web_auth_pane);
#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 9247 "RESTSupport.c"
+#line 9258 "RESTSupport.c"
}
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 1a9052b..b76bead 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -246,21 +246,21 @@ public class Transaction {
protected void check_response(Soup.Message message) throws Spit.Publishing.PublishingError {
switch (message.status_code) {
- case Soup.KnownStatusCode.OK:
- case Soup.KnownStatusCode.CREATED: // HTTP code 201 (CREATED) signals that a new
- // resource was created in response to a PUT or POST
+ case Soup.Status.OK:
+ case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
+ // resource was created in response to a PUT or POST
break;
- case Soup.KnownStatusCode.CANT_RESOLVE:
- case Soup.KnownStatusCode.CANT_RESOLVE_PROXY:
+ case Soup.Status.CANT_RESOLVE:
+ case Soup.Status.CANT_RESOLVE_PROXY:
throw new Spit.Publishing.PublishingError.NO_ANSWER("Unable to resolve %s (error code %u)",
get_endpoint_url(), message.status_code);
- case Soup.KnownStatusCode.CANT_CONNECT:
- case Soup.KnownStatusCode.CANT_CONNECT_PROXY:
+ case Soup.Status.CANT_CONNECT:
+ case Soup.Status.CANT_CONNECT_PROXY:
throw new Spit.Publishing.PublishingError.NO_ANSWER("Unable to connect to %s (error code %u)",
get_endpoint_url(), message.status_code);
- case Soup.KnownStatusCode.SSL_FAILED:
+ case Soup.Status.SSL_FAILED:
throw new Spit.Publishing.PublishingError.SSL_FAILED ("Unable to connect to %s: Secure connection failed",
get_endpoint_url ());
@@ -511,7 +511,7 @@ public class UploadTransaction : Transaction {
int payload_part_num = message_parts.get_length();
- Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, payload.data[0:payload_length]);
+ Soup.Buffer bindable_data = new Soup.Buffer.take (payload.data);
message_parts.append_form_file("", publishable.get_serialized_file().get_path(), mime_type,
bindable_data);
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
index 27f4f44..372350f 100644
--- a/plugins/common/WebAuthenticationPane.c
+++ b/plugins/common/WebAuthenticationPane.c
@@ -13,8 +13,8 @@
#include <stdlib.h>
#include <string.h>
#include <webkit2/webkit2.h>
-#include <gtk/gtk.h>
#include <gdk/gdk.h>
+#include <gtk/gtk.h>
#define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
@@ -44,7 +44,6 @@ struct _ShotwellPluginsCommonWebAuthenticationPanePrivate {
SpitPublishingDialogPaneGeometryOptions _preferred_geometry;
gchar* _login_uri;
WebKitWebView* webview;
- GtkBox* pane_widget;
};
@@ -82,28 +81,28 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (
static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
-#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_on_page_load_changed ((ShotwellPluginsCommonWebAuthenticationPane*) self, load_event);
-#line 88 "WebAuthenticationPane.c"
+#line 87 "WebAuthenticationPane.c"
}
static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self) {
gboolean result = FALSE;
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
result = FALSE;
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 98 "WebAuthenticationPane.c"
+#line 97 "WebAuthenticationPane.c"
}
static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
gboolean result;
result = __lambda4_ ((ShotwellPluginsCommonWebAuthenticationPane*) self);
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 107 "WebAuthenticationPane.c"
+#line 106 "WebAuthenticationPane.c"
}
@@ -114,81 +113,64 @@ static void shotwell_plugins_common_web_authentication_pane_real_constructed (GO
WebKitSettings* _tmp2_ = NULL;
WebKitWebView* _tmp3_ = NULL;
WebKitWebView* _tmp4_ = NULL;
- GtkBox* _tmp5_ = NULL;
- GtkBox* _tmp6_ = NULL;
- WebKitWebView* _tmp7_ = NULL;
-#line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 20 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp0_ = (WebKitWebView*) webkit_web_view_new ();
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_object_ref_sink (_tmp0_);
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (self->priv->webview);
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self->priv->webview = _tmp0_;
-#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp1_ = self->priv->webview;
-#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp2_ = webkit_web_view_get_settings (_tmp1_);
-#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
webkit_settings_set_enable_plugins (_tmp2_, FALSE);
-#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp3_ = self->priv->webview;
-#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_signal_connect_object (_tmp3_, "load-changed", (GCallback) _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp4_ = self->priv->webview;
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_signal_connect_object (_tmp4_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp5_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- g_object_ref_sink (_tmp5_);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- self->priv->pane_widget = _tmp5_;
-#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp6_ = self->priv->pane_widget;
-#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp7_ = self->priv->webview;
-#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- gtk_box_pack_start (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 161 "WebAuthenticationPane.c"
+#line 143 "WebAuthenticationPane.c"
}
static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_critical ("Type `%s' does not implement abstract method `shotwell_plugins_common_web_authentication_pane_on_page_load'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return;
-#line 170 "WebAuthenticationPane.c"
+#line 152 "WebAuthenticationPane.c"
}
void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS (self)->on_page_load (self);
-#line 179 "WebAuthenticationPane.c"
+#line 161 "WebAuthenticationPane.c"
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return self ? g_object_ref (self) : NULL;
-#line 186 "WebAuthenticationPane.c"
+#line 168 "WebAuthenticationPane.c"
}
void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) {
GdkWindow* window = NULL;
- GtkBox* _tmp0_ = NULL;
+ WebKitWebView* _tmp0_ = NULL;
GdkWindow* _tmp1_ = NULL;
GdkWindow* _tmp2_ = NULL;
GdkDisplay* display = NULL;
@@ -197,77 +179,77 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
GdkCursor* cursor = NULL;
GdkCursorType _tmp5_ = 0;
GdkCursor* _tmp6_ = NULL;
-#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->webview;
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
window = _tmp2_;
-#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp3_ = gdk_window_get_display (window);
-#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
display = _tmp4_;
-#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp5_ = type;
-#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp6_ = gdk_cursor_new_for_display (display, _tmp5_);
-#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
cursor = _tmp6_;
-#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- gdk_window_set_cursor (window, cursor);
#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ gdk_window_set_cursor (window, cursor);
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (cursor);
-#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (display);
-#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (window);
-#line 231 "WebAuthenticationPane.c"
+#line 213 "WebAuthenticationPane.c"
}
static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) {
WebKitLoadEvent _tmp0_ = 0;
-#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp0_ = load_event;
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
switch (_tmp0_) {
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_STARTED:
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_REDIRECTED:
-#line 247 "WebAuthenticationPane.c"
+#line 229 "WebAuthenticationPane.c"
{
-#line 45 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_WATCH);
-#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 253 "WebAuthenticationPane.c"
+#line 235 "WebAuthenticationPane.c"
}
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
case WEBKIT_LOAD_FINISHED:
-#line 257 "WebAuthenticationPane.c"
+#line 239 "WebAuthenticationPane.c"
{
-#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 44 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_LEFT_PTR);
-#line 49 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
shotwell_plugins_common_web_authentication_pane_on_page_load (self);
-#line 50 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 265 "WebAuthenticationPane.c"
+#line 247 "WebAuthenticationPane.c"
}
default:
{
-#line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 271 "WebAuthenticationPane.c"
+#line 253 "WebAuthenticationPane.c"
}
}
}
@@ -277,17 +259,17 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel
WebKitWebView* result = NULL;
WebKitWebView* _tmp0_ = NULL;
WebKitWebView* _tmp1_ = NULL;
-#line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp0_ = self->priv->webview;
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
result = _tmp1_;
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 291 "WebAuthenticationPane.c"
+#line 273 "WebAuthenticationPane.c"
}
@@ -295,34 +277,34 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authe
ShotwellPluginsCommonWebAuthenticationPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
-#line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp0_ = self->priv->_preferred_geometry;
-#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
result = _tmp0_;
-#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 307 "WebAuthenticationPane.c"
+#line 289 "WebAuthenticationPane.c"
}
static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
ShotwellPluginsCommonWebAuthenticationPane * self;
GtkWidget* result = NULL;
- GtkBox* _tmp0_ = NULL;
+ WebKitWebView* _tmp0_ = NULL;
GtkWidget* _tmp1_ = NULL;
-#line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->webview;
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
result = _tmp1_;
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 326 "WebAuthenticationPane.c"
+#line 308 "WebAuthenticationPane.c"
}
@@ -333,33 +315,33 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_install
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 68 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (self);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp1_ = _tmp0_;
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp2_ = shotwell_plugins_common_web_authentication_pane_get_login_uri (self);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp3_ = _tmp2_;
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_tmp4_ = _tmp3_;
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
webkit_web_view_load_uri (_tmp1_, _tmp4_);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_free0 (_tmp4_);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (_tmp1_);
-#line 355 "WebAuthenticationPane.c"
+#line 337 "WebAuthenticationPane.c"
}
static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
ShotwellPluginsCommonWebAuthenticationPane * self;
-#line 72 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 363 "WebAuthenticationPane.c"
+#line 345 "WebAuthenticationPane.c"
}
@@ -369,7 +351,7 @@ ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authenti
self = (ShotwellPluginsCommonWebAuthenticationPane*) g_object_new (object_type, NULL);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return self;
-#line 373 "WebAuthenticationPane.c"
+#line 355 "WebAuthenticationPane.c"
}
@@ -384,7 +366,7 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authenticati
result = _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 388 "WebAuthenticationPane.c"
+#line 370 "WebAuthenticationPane.c"
}
@@ -398,7 +380,7 @@ static void shotwell_plugins_common_web_authentication_pane_set_preferred_geomet
self->priv->_preferred_geometry = _tmp0_;
#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_object_notify ((GObject *) self, "preferred-geometry");
-#line 402 "WebAuthenticationPane.c"
+#line 384 "WebAuthenticationPane.c"
}
@@ -416,7 +398,7 @@ gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPl
result = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
return result;
-#line 420 "WebAuthenticationPane.c"
+#line 402 "WebAuthenticationPane.c"
}
@@ -435,7 +417,7 @@ static void shotwell_plugins_common_web_authentication_pane_set_login_uri (Shotw
self->priv->_login_uri = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_object_notify ((GObject *) self, "login-uri");
-#line 439 "WebAuthenticationPane.c"
+#line 421 "WebAuthenticationPane.c"
}
@@ -458,7 +440,7 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell
g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 462 "WebAuthenticationPane.c"
+#line 444 "WebAuthenticationPane.c"
}
@@ -473,7 +455,7 @@ static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dial
iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed;
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled;
-#line 477 "WebAuthenticationPane.c"
+#line 459 "WebAuthenticationPane.c"
}
@@ -482,7 +464,7 @@ static void shotwell_plugins_common_web_authentication_pane_instance_init (Shotw
self->priv = SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
#line 10 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 486 "WebAuthenticationPane.c"
+#line 468 "WebAuthenticationPane.c"
}
@@ -494,11 +476,9 @@ static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* o
_g_free0 (self->priv->_login_uri);
#line 16 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
_g_object_unref0 (self->priv->webview);
-#line 17 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
- _g_object_unref0 (self->priv->pane_widget);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj);
-#line 502 "WebAuthenticationPane.c"
+#line 482 "WebAuthenticationPane.c"
}
@@ -533,13 +513,13 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (
g_value_take_string (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self));
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 537 "WebAuthenticationPane.c"
+#line 517 "WebAuthenticationPane.c"
default:
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 543 "WebAuthenticationPane.c"
+#line 523 "WebAuthenticationPane.c"
}
}
@@ -561,13 +541,13 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (
shotwell_plugins_common_web_authentication_pane_set_login_uri (self, g_value_get_string (value));
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 565 "WebAuthenticationPane.c"
+#line 545 "WebAuthenticationPane.c"
default:
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
break;
-#line 571 "WebAuthenticationPane.c"
+#line 551 "WebAuthenticationPane.c"
}
}
diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala
index 0a77cf6..c537748 100644
--- a/plugins/common/WebAuthenticationPane.vala
+++ b/plugins/common/WebAuthenticationPane.vala
@@ -14,7 +14,6 @@ namespace Shotwell.Plugins.Common {
public string login_uri { owned get; construct; }
private WebKit.WebView webview;
- private Gtk.Box pane_widget;
public override void constructed () {
base.constructed ();
@@ -24,15 +23,12 @@ namespace Shotwell.Plugins.Common {
this.webview.load_changed.connect (this.on_page_load_changed);
this.webview.context_menu.connect ( () => { return false; });
-
- this.pane_widget = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
- this.pane_widget.pack_start (this.webview, true, true, 0);
}
public abstract void on_page_load ();
protected void set_cursor (Gdk.CursorType type) {
- var window = pane_widget.get_window ();
+ var window = webview.get_window ();
var display = window.get_display ();
var cursor = new Gdk.Cursor.for_display (display, type);
window.set_cursor (cursor);
@@ -62,7 +58,7 @@ namespace Shotwell.Plugins.Common {
}
public Gtk.Widget get_widget() {
- return pane_widget;
+ return this.webview;
}
public void on_pane_installed () {
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index a9d1ed8..a5285c0 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -16,6 +16,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h>
#include <webkit2/webkit2.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS
@@ -132,6 +133,17 @@ typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommon
typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
+#define SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE (shotwell_plugins_common_builder_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+
+typedef struct _ShotwellPluginsCommonBuilderPane ShotwellPluginsCommonBuilderPane;
+typedef struct _ShotwellPluginsCommonBuilderPaneClass ShotwellPluginsCommonBuilderPaneClass;
+typedef struct _ShotwellPluginsCommonBuilderPanePrivate ShotwellPluginsCommonBuilderPanePrivate;
+
struct _PublishingRESTSupportSession {
GTypeInstance parent_instance;
volatile int ref_count;
@@ -259,6 +271,18 @@ struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
};
+struct _ShotwellPluginsCommonBuilderPane {
+ GObject parent_instance;
+ ShotwellPluginsCommonBuilderPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonBuilderPaneClass {
+ GObjectClass parent_class;
+ GtkWidget* (*get_default_widget) (ShotwellPluginsCommonBuilderPane* self);
+ void (*on_pane_installed) (ShotwellPluginsCommonBuilderPane* self);
+ void (*on_pane_uninstalled) (ShotwellPluginsCommonBuilderPane* self);
+};
+
gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
gpointer publishing_rest_support_session_ref (gpointer instance);
@@ -407,6 +431,16 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel
ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
+GType shotwell_plugins_common_builder_pane_get_type (void) G_GNUC_CONST;
+GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self);
+GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
+ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self);
+gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self);
+gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self);
+gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self);
G_END_DECLS
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index 0aed09c..b5367a4 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -143,6 +143,19 @@ namespace Shotwell {
namespace Plugins {
namespace Common {
[CCode (cheader_filename = "shotwell-plugin-common.h")]
+ public abstract class BuilderPane : Spit.Publishing.DialogPane, GLib.Object {
+ public BuilderPane ();
+ public override void constructed ();
+ public Gtk.Builder get_builder ();
+ public virtual Gtk.Widget get_default_widget ();
+ public virtual void on_pane_installed ();
+ public virtual void on_pane_uninstalled ();
+ public bool connect_signals { get; construct; }
+ public string default_id { owned get; construct; }
+ public Spit.Publishing.DialogPane.GeometryOptions preferred_geometry { get; construct; }
+ public string resource_path { owned get; construct; }
+ }
+ [CCode (cheader_filename = "shotwell-plugin-common.h")]
public abstract class WebAuthenticationPane : Spit.Publishing.DialogPane, GLib.Object {
public WebAuthenticationPane ();
public override void constructed ();
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"
+ 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 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#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"
- spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_);
+ _tmp14_ = _tmp13_;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
- _g_error_free0 (_tmp13_);
-#line 2461 "TumblrPublishing.c"
+ spit_publishing_plugin_host_post_error (_tmp10_, _tmp14_);
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+ _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 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkWindow" id="authentication_pane">
<property name="can_focus">False</property>
<child>
- <object class="GtkAlignment" id="alignment">
+ <object class="GtkVBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xscale">0.5</property>
- <property name="yscale">0.5</property>
+ <property name="margin_left">30</property>
+ <property name="margin_right">30</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkLabel" id="message_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">30</property>
- <property name="margin_right">30</property>
<property name="hexpand">True</property>
- <property name="spacing">8</property>
+ <property name="vexpand">True</property>
+ <property name="label">label</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="field_table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">8</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Email address</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">username_entry</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
<child>
- <object class="GtkLabel" id="message_label">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="label" translatable="yes">_Password</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
<property name="xalign">0</property>
- <property name="label">label</property>
- <property name="wrap">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="field_table">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Email address</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">username_entry</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="username_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="password_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="remember_checkbutton">
- <property name="label" translatable="yes">_Remember</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="remember_checkbutton">
+ <property name="label" translatable="yes">_Remember</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButton" id="login_button">
+ <property name="label" translatable="yes">Log in</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkButton" id="login_button">
- <property name="label" translatable="yes">Log in</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
</object>
</child>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="authentication_pane">
<property name="can_focus">False</property>
<child>
- <object class="GtkAlignment" id="alignment">
+ <object class="GtkVBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xscale">0.5</property>
- <property name="yscale">0.5</property>
+ <property name="margin_left">30</property>
+ <property name="margin_right">30</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">8</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkLabel" id="message_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">30</property>
- <property name="margin_right">30</property>
<property name="hexpand">True</property>
- <property name="spacing">8</property>
+ <property name="vexpand">True</property>
+ <property name="label">label</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="field_table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">8</property>
+ <property name="row_spacing">2</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Email address</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">username_entry</property>
+ <property name="xalign">0</property>
+ </object>
+ </child>
<child>
- <object class="GtkLabel" id="message_label">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="label" translatable="yes">_Password</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
<property name="xalign">0</property>
- <property name="label">label</property>
- <property name="wrap">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="field_table">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Email address</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">username_entry</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="username_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="password_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkButton" id="login_button">
- <property name="label" translatable="yes">Log in</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="login_button">
+ <property name="label" translatable="yes">Log in</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
</object>
</child>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.14"/>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Public</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Friends</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Private</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststore2">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkWindow" id="publish_options_window">
+ <property name="can_focus">False</property>
<child>
- <object class="GtkAlignment" id="alignment">
+ <object class="GtkVBox" id="content">
<property name="visible">True</property>
- <property name="xalign">0.30000001192092896</property>
- <property name="xscale">0.10000000149011612</property>
- <property name="yscale">0.10000000149011612</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="xalign">0.30000001192092896</property>
- <property name="label" translatable="yes">_Albums (or write new):</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">album_list</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="ypad">6</property>
- <property name="label" translatable="yes">Access _type:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">access_type_list</property>
- </object>
- </child>
- <child>
- <object class="GtkComboBoxText" id="access_type_list">
- <property name="visible">True</property>
- <property name="model">liststore1</property>
- <property name="active">0</property>
- <property name="text_column">0</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_padding">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="album_list">
- <property name="visible">True</property>
- <property name="model">liststore2</property>
- <property name="active">0</property>
- <property name="text_column">0</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_padding">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Albums (or write new):</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">album_list</property>
+ <property name="xalign">0.30000001192092896</property>
</object>
<packing>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="ypad">6</property>
+ <property name="label" translatable="yes">Access _type:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">access_type_list</property>
+ <property name="xalign">0</property>
+ </object>
</child>
<child>
- <object class="GtkCheckButton" id="disable_comments_check">
- <property name="label" translatable="yes">Disable _comments</property>
+ <object class="GtkComboBoxText" id="access_type_list">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0.30000001192092896</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">0</property>
</object>
<packing>
- <property name="padding">2</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_padding">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="hide_original_check">
- <property name="label" translatable="yes">_Forbid downloading original photo</property>
+ <object class="GtkComboBoxText" id="album_list">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_padding">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="disable_comments_check">
+ <property name="label" translatable="yes">Disable _comments</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.30000001192092896</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="hide_original_check">
+ <property name="label" translatable="yes">_Forbid downloading original photo</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.30000001192092896</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <property name="layout_style">spread</property>
+ <child>
+ <object class="GtkButton" id="logout_button">
+ <property name="label" translatable="yes">_Logout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="receives_default">True</property>
<property name="use_underline">True</property>
- <property name="xalign">0.30000001192092896</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButton" id="publish_button">
+ <property name="label" translatable="yes">_Publish</property>
<property name="visible">True</property>
- <property name="spacing">2</property>
- <property name="layout_style">spread</property>
- <child>
- <object class="GtkButton" id="logout_button">
- <property name="label" translatable="yes">_Logout</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="publish_button">
- <property name="label" translatable="yes">_Publish</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="padding">12</property>
- <property name="position">4</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="padding">12</property>
+ <property name="position">4</property>
+ </packing>
</child>
</object>
</child>
</object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name text -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Public</col>
- </row>
- <row>
- <col id="0" translatable="yes">Friends</col>
- </row>
- <row>
- <col id="0" translatable="yes">Private</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="liststore2">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- </object>
</interface>
diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index 7c88a45..da03420 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -10203,7 +10203,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
_tmp34__length1 = payload_length1;
#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
- _tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
+ _tmp35_ = soup_buffer_new_with_owner (_tmp34_, _tmp34__length1, self, NULL);
#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
image_data = _tmp35_;
#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index 3fafe37..8c5222a 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -1347,7 +1347,7 @@ internal class GraphSession {
unowned uint8[] payload = (uint8[]) mapped_file.get_contents();
payload.length = (int) mapped_file.get_length();
- Soup.Buffer image_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, payload);
+ var image_data = new Soup.Buffer.with_owner (payload, this, null);
Soup.Multipart mp_envelope = new Soup.Multipart("multipart/form-data");
@@ -1447,9 +1447,9 @@ internal class GraphSession {
// these error types are always recoverable given the unique behavior of the Facebook
// endpoint, so try again
- if (msg.status_code == Soup.KnownStatusCode.IO_ERROR ||
- msg.status_code == Soup.KnownStatusCode.MALFORMED ||
- msg.status_code == Soup.KnownStatusCode.TRY_AGAIN) {
+ if (msg.status_code == Soup.Status.IO_ERROR ||
+ msg.status_code == Soup.Status.MALFORMED ||
+ msg.status_code == Soup.Status.TRY_AGAIN) {
real_message.bytes_so_far = 0;
soup_session.queue_message(msg, null);
return;
@@ -1460,8 +1460,8 @@ internal class GraphSession {
Spit.Publishing.PublishingError? error = null;
switch (msg.status_code) {
- case Soup.KnownStatusCode.OK:
- case Soup.KnownStatusCode.CREATED: // HTTP code 201 (CREATED) signals that a new
+ case Soup.Status.OK:
+ case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
// resource was created in response to a PUT
// or POST
break;
@@ -1471,14 +1471,14 @@ internal class GraphSession {
"OAuth Access Token has Expired. Logout user.");
break;
- case Soup.KnownStatusCode.CANT_RESOLVE:
- case Soup.KnownStatusCode.CANT_RESOLVE_PROXY:
+ case Soup.Status.CANT_RESOLVE:
+ case Soup.Status.CANT_RESOLVE_PROXY:
error = new Spit.Publishing.PublishingError.NO_ANSWER(
"Unable to resolve %s (error code %u)", real_message.get_uri(), msg.status_code);
break;
- case Soup.KnownStatusCode.CANT_CONNECT:
- case Soup.KnownStatusCode.CANT_CONNECT_PROXY:
+ case Soup.Status.CANT_CONNECT:
+ case Soup.Status.CANT_CONNECT_PROXY:
error = new Spit.Publishing.PublishingError.NO_ANSWER(
"Unable to connect to %s (error code %u)", real_message.get_uri(), msg.status_code);
break;
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index d65f678..a6ea1f8 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -495,7 +495,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi
static const gchar* flickr_service_real_get_id (SpitPluggable* base);
static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base);
static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length);
static void flickr_service_real_activation (SpitPluggable* base, gboolean enabled);
static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
@@ -693,7 +693,7 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis
static void _g_free0_ (gpointer var);
static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1);
-static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length);
+static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length);
gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self);
static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
@@ -875,7 +875,7 @@ static gpointer _g_object_ref0 (gpointer self) {
}
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length) {
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -965,7 +965,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp8__length1 = flickr_service_icon_pixbuf_set_length1;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup7 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+ _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp9__length1 = _tmp8__length1;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6187,7 +6187,7 @@ static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
}
-static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) {
+static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) {
PublishingRESTSupportArgument** result;
int i;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6223,7 +6223,7 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp0__length1 = self->priv->auth_header_fields_length1;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+ _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
_tmp1__length1 = _tmp0__length1;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index b64f426..ea3cc5f 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -485,6 +485,7 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (Pub
PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable);
gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self);
static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static guint8* _vala_array_dup5 (guint8* self, int length);
static void _vala_SoupBuffer_free (SoupBuffer* self);
static void _vala_SoupMultipart_free (SoupMultipart* self);
static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
@@ -542,8 +543,8 @@ enum {
PUBLISHING_PICASA_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
};
gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self);
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length);
static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length);
+static PublishingPicasaAlbum** _vala_array_dup7 (PublishingPicasaAlbum** self, int length);
static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj);
#define PUBLISHING_PICASA_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploaderPrivate))
enum {
@@ -570,7 +571,7 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
_tmp0__length1 = picasa_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp0_ == NULL) {
-#line 562 "PicasaPublishing.c"
+#line 563 "PicasaPublishing.c"
gint _tmp1_ = 0;
GdkPixbuf** _tmp2_ = NULL;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -583,18 +584,18 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
picasa_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1;
-#line 575 "PicasaPublishing.c"
+#line 576 "PicasaPublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 579 "PicasaPublishing.c"
+#line 580 "PicasaPublishing.c"
}
PicasaService* picasa_service_new (GFile* resource_directory) {
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory);
-#line 586 "PicasaPublishing.c"
+#line 587 "PicasaPublishing.c"
}
@@ -616,7 +617,7 @@ static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gi
result = _tmp2_;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 608 "PicasaPublishing.c"
+#line 609 "PicasaPublishing.c"
}
@@ -629,7 +630,7 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.picasa";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 621 "PicasaPublishing.c"
+#line 622 "PicasaPublishing.c"
}
@@ -642,14 +643,14 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base)
result = "Picasa Web Albums";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 634 "PicasaPublishing.c"
+#line 635 "PicasaPublishing.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 641 "PicasaPublishing.c"
+#line 642 "PicasaPublishing.c"
}
@@ -660,17 +661,17 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (i = 0; i < length; i++) {
-#line 652 "PicasaPublishing.c"
+#line 653 "PicasaPublishing.c"
GdkPixbuf* _tmp0_ = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result[i] = _tmp0_;
-#line 658 "PicasaPublishing.c"
+#line 659 "PicasaPublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 662 "PicasaPublishing.c"
+#line 663 "PicasaPublishing.c"
}
@@ -752,7 +753,7 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
(*info).icons = _tmp9_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*info).icons_length1 = _tmp9__length1;
-#line 744 "PicasaPublishing.c"
+#line 745 "PicasaPublishing.c"
}
@@ -773,7 +774,7 @@ static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublis
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 765 "PicasaPublishing.c"
+#line 766 "PicasaPublishing.c"
}
@@ -786,7 +787,7 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 778 "PicasaPublishing.c"
+#line 779 "PicasaPublishing.c"
}
@@ -794,7 +795,7 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable
PicasaService * self;
#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
-#line 786 "PicasaPublishing.c"
+#line 787 "PicasaPublishing.c"
}
@@ -803,7 +804,7 @@ static void picasa_service_class_init (PicasaServiceClass * klass) {
picasa_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize;
-#line 795 "PicasaPublishing.c"
+#line 796 "PicasaPublishing.c"
}
@@ -820,7 +821,7 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) picasa_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
iface->activation = (void (*)(SpitPluggable*, gboolean)) picasa_service_real_activation;
-#line 812 "PicasaPublishing.c"
+#line 813 "PicasaPublishing.c"
}
@@ -831,7 +832,7 @@ static void picasa_service_spit_publishing_service_interface_init (SpitPublishin
iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) picasa_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) picasa_service_real_get_supported_media;
-#line 823 "PicasaPublishing.c"
+#line 824 "PicasaPublishing.c"
}
@@ -845,7 +846,7 @@ static void picasa_service_finalize (GObject* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj);
-#line 837 "PicasaPublishing.c"
+#line 838 "PicasaPublishing.c"
}
@@ -905,7 +906,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
_tmp4_ = host;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_);
-#line 897 "PicasaPublishing.c"
+#line 898 "PicasaPublishing.c"
{
SpitPublishingPublishable** p_collection = NULL;
gint p_collection_length1 = 0;
@@ -917,14 +918,14 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
p_collection_length1 = _tmp5_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) {
-#line 909 "PicasaPublishing.c"
+#line 910 "PicasaPublishing.c"
SpitPublishingPublishable* _tmp7_ = NULL;
SpitPublishingPublishable* p = NULL;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp7_ = _g_object_ref0 (p_collection[p_it]);
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
p = _tmp7_;
-#line 916 "PicasaPublishing.c"
+#line 917 "PicasaPublishing.c"
{
SpitPublishingPublisherMediaType _tmp8_ = 0;
SpitPublishingPublishable* _tmp9_ = NULL;
@@ -939,12 +940,12 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
media_type = _tmp8_ | _tmp10_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (p);
-#line 931 "PicasaPublishing.c"
+#line 932 "PicasaPublishing.c"
}
}
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 936 "PicasaPublishing.c"
+#line 937 "PicasaPublishing.c"
}
#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp11_ = self->priv->publishing_parameters;
@@ -976,14 +977,14 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 968 "PicasaPublishing.c"
+#line 969 "PicasaPublishing.c"
}
PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host);
-#line 975 "PicasaPublishing.c"
+#line 976 "PicasaPublishing.c"
}
@@ -994,13 +995,13 @@ static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int*
*size = (*size) ? (2 * (*size)) : 4;
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 986 "PicasaPublishing.c"
+#line 987 "PicasaPublishing.c"
}
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 992 "PicasaPublishing.c"
+#line 993 "PicasaPublishing.c"
}
@@ -1034,7 +1035,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp2_ = _tmp1_->name;
#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1026 "PicasaPublishing.c"
+#line 1027 "PicasaPublishing.c"
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1043,7 +1044,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp4_ = _tmp3_->children;
#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
doc_node_iter = _tmp4_;
-#line 1035 "PicasaPublishing.c"
+#line 1036 "PicasaPublishing.c"
} else {
xmlNode* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -1053,13 +1054,13 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp6_ = _tmp5_->name;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1045 "PicasaPublishing.c"
+#line 1046 "PicasaPublishing.c"
xmlNode* _tmp7_ = NULL;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp7_ = document_root;
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
doc_node_iter = _tmp7_;
-#line 1051 "PicasaPublishing.c"
+#line 1052 "PicasaPublishing.c"
} else {
GError* _tmp8_ = NULL;
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1074,7 +1075,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 1066 "PicasaPublishing.c"
+#line 1067 "PicasaPublishing.c"
} else {
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
@@ -1084,7 +1085,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
g_clear_error (&_inner_error_);
#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 1076 "PicasaPublishing.c"
+#line 1077 "PicasaPublishing.c"
}
}
}
@@ -1094,7 +1095,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp9_ = TRUE;
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 1086 "PicasaPublishing.c"
+#line 1087 "PicasaPublishing.c"
xmlNode* _tmp12_ = NULL;
xmlNode* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
@@ -1110,7 +1111,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
PublishingPicasaAlbum* _tmp35_ = NULL;
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!_tmp9_) {
-#line 1102 "PicasaPublishing.c"
+#line 1103 "PicasaPublishing.c"
xmlNode* _tmp10_ = NULL;
xmlNode* _tmp11_ = NULL;
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1119,7 +1120,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp11_ = _tmp10_->next;
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
doc_node_iter = _tmp11_;
-#line 1111 "PicasaPublishing.c"
+#line 1112 "PicasaPublishing.c"
}
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp9_ = FALSE;
@@ -1129,7 +1130,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
if (!(_tmp12_ != NULL)) {
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 1121 "PicasaPublishing.c"
+#line 1122 "PicasaPublishing.c"
}
#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp13_ = doc_node_iter;
@@ -1139,7 +1140,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
if (g_strcmp0 (_tmp14_, "entry") != 0) {
#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
continue;
-#line 1131 "PicasaPublishing.c"
+#line 1132 "PicasaPublishing.c"
}
#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
name_val = NULL;
@@ -1151,20 +1152,20 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp16_ = _tmp15_->children;
#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
album_node_iter = _tmp16_;
-#line 1143 "PicasaPublishing.c"
+#line 1144 "PicasaPublishing.c"
{
gboolean _tmp17_ = FALSE;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp17_ = TRUE;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 1150 "PicasaPublishing.c"
+#line 1151 "PicasaPublishing.c"
xmlNode* _tmp20_ = NULL;
xmlNode* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!_tmp17_) {
-#line 1156 "PicasaPublishing.c"
+#line 1157 "PicasaPublishing.c"
xmlNode* _tmp18_ = NULL;
xmlNode* _tmp19_ = NULL;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1173,7 +1174,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp19_ = _tmp18_->next;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
album_node_iter = _tmp19_;
-#line 1165 "PicasaPublishing.c"
+#line 1166 "PicasaPublishing.c"
}
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp17_ = FALSE;
@@ -1183,7 +1184,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
if (!(_tmp20_ != NULL)) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 1175 "PicasaPublishing.c"
+#line 1176 "PicasaPublishing.c"
}
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp21_ = album_node_iter;
@@ -1191,7 +1192,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp22_ = _tmp21_->name;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1183 "PicasaPublishing.c"
+#line 1184 "PicasaPublishing.c"
xmlNode* _tmp23_ = NULL;
gchar* _tmp24_ = NULL;
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1202,7 +1203,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_g_free0 (name_val);
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
name_val = _tmp24_;
-#line 1194 "PicasaPublishing.c"
+#line 1195 "PicasaPublishing.c"
} else {
xmlNode* _tmp25_ = NULL;
const gchar* _tmp26_ = NULL;
@@ -1212,7 +1213,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_tmp26_ = _tmp25_->name;
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1204 "PicasaPublishing.c"
+#line 1205 "PicasaPublishing.c"
xmlNode* _tmp27_ = NULL;
xmlNs* _tmp28_ = NULL;
const gchar* _tmp29_ = NULL;
@@ -1228,7 +1229,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
if (_tmp29_ != NULL) {
#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
continue;
-#line 1220 "PicasaPublishing.c"
+#line 1221 "PicasaPublishing.c"
}
#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp30_ = album_node_iter;
@@ -1238,7 +1239,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_g_free0 (url_val);
#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
url_val = _tmp31_;
-#line 1230 "PicasaPublishing.c"
+#line 1231 "PicasaPublishing.c"
}
}
}
@@ -1259,7 +1260,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
_g_free0 (url_val);
#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (name_val);
-#line 1251 "PicasaPublishing.c"
+#line 1252 "PicasaPublishing.c"
}
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1270,13 +1271,13 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
if (result_length1) {
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*result_length1 = _tmp36__length1;
-#line 1262 "PicasaPublishing.c"
+#line 1263 "PicasaPublishing.c"
}
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = _tmp36_;
#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 1268 "PicasaPublishing.c"
+#line 1269 "PicasaPublishing.c"
}
@@ -1323,7 +1324,7 @@ static void publishing_picasa_picasa_publisher_load_parameters_from_configuratio
publishing_picasa_publishing_parameters_set_target_album_name (_tmp6_, _tmp9_);
#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (_tmp9_);
-#line 1315 "PicasaPublishing.c"
+#line 1316 "PicasaPublishing.c"
}
@@ -1370,7 +1371,7 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_);
#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (_tmp9_);
-#line 1362 "PicasaPublishing.c"
+#line 1363 "PicasaPublishing.c"
}
@@ -1388,13 +1389,13 @@ static void publishing_picasa_picasa_publisher_on_service_welcome_login (Publish
if (!_tmp0_) {
#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1379 "PicasaPublishing.c"
+#line 1380 "PicasaPublishing.c"
}
#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1_ = self->priv->refresh_token;
#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1385 "PicasaPublishing.c"
+#line 1386 "PicasaPublishing.c"
}
@@ -1448,21 +1449,21 @@ static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (Publ
_publishing_rest_support_session_unref0 (_tmp7_);
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_fetch_account_information (self);
-#line 1439 "PicasaPublishing.c"
+#line 1440 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1446 "PicasaPublishing.c"
+#line 1447 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_initial_album_fetch_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1453 "PicasaPublishing.c"
+#line 1454 "PicasaPublishing.c"
}
@@ -1495,7 +1496,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (
if (!_tmp4_) {
#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1486 "PicasaPublishing.c"
+#line 1487 "PicasaPublishing.c"
}
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:161: EVENT: finished fetching account and album " \
@@ -1504,7 +1505,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (
_tmp5_ = txn;
#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction));
-#line 1494 "PicasaPublishing.c"
+#line 1495 "PicasaPublishing.c"
}
@@ -1542,7 +1543,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
if (!_tmp4_) {
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1532 "PicasaPublishing.c"
+#line 1533 "PicasaPublishing.c"
}
#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp5_ = bad_txn;
@@ -1563,7 +1564,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
if (_tmp10_ == ((guint) 403)) {
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp8_ = TRUE;
-#line 1552 "PicasaPublishing.c"
+#line 1553 "PicasaPublishing.c"
} else {
PublishingRESTSupportTransaction* _tmp11_ = NULL;
guint _tmp12_ = 0U;
@@ -1573,13 +1574,13 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
_tmp12_ = publishing_rest_support_transaction_get_status_code (_tmp11_);
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp8_ = _tmp12_ == ((guint) 404);
-#line 1562 "PicasaPublishing.c"
+#line 1563 "PicasaPublishing.c"
}
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp8_) {
#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1568 "PicasaPublishing.c"
+#line 1569 "PicasaPublishing.c"
} else {
SpitPublishingPluginHost* _tmp13_ = NULL;
GError* _tmp14_ = NULL;
@@ -1589,7 +1590,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
_tmp14_ = err;
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 1578 "PicasaPublishing.c"
+#line 1579 "PicasaPublishing.c"
}
}
@@ -1604,14 +1605,14 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_logout (Pub
if (!_tmp0_) {
#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1593 "PicasaPublishing.c"
+#line 1594 "PicasaPublishing.c"
}
#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:189: EVENT: user clicked 'Logout' in the publish" \
"ing options pane.");
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1599 "PicasaPublishing.c"
+#line 1600 "PicasaPublishing.c"
}
@@ -1628,7 +1629,7 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu
if (!_tmp0_) {
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1616 "PicasaPublishing.c"
+#line 1617 "PicasaPublishing.c"
}
#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:198: EVENT: user clicked 'Publish' in the publis" \
@@ -1645,11 +1646,11 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu
if (_tmp3_) {
#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_create_album (self);
-#line 1632 "PicasaPublishing.c"
+#line 1633 "PicasaPublishing.c"
} else {
#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_upload (self);
-#line 1636 "PicasaPublishing.c"
+#line 1637 "PicasaPublishing.c"
}
}
@@ -1657,21 +1658,21 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu
static void _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_album_creation_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1644 "PicasaPublishing.c"
+#line 1645 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_album_creation_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1651 "PicasaPublishing.c"
+#line 1652 "PicasaPublishing.c"
}
static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 1658 "PicasaPublishing.c"
+#line 1659 "PicasaPublishing.c"
}
@@ -1680,7 +1681,7 @@ static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publis
result = publishing_picasa_album_directory_transaction_validate_xml (doc);
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 1667 "PicasaPublishing.c"
+#line 1668 "PicasaPublishing.c"
}
@@ -1727,7 +1728,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
if (!_tmp4_) {
#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1714 "PicasaPublishing.c"
+#line 1715 "PicasaPublishing.c"
}
#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:216: EVENT: finished creating album on remote se" \
@@ -1738,7 +1739,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
_tmp6_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransaction));
#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
downcast_txn = _tmp6_;
-#line 1724 "PicasaPublishing.c"
+#line 1725 "PicasaPublishing.c"
{
PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
PublishingPicasaAlbumCreationTransaction* _tmp8_ = NULL;
@@ -1765,7 +1766,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1751 "PicasaPublishing.c"
+#line 1752 "PicasaPublishing.c"
goto __catch7_spit_publishing_publishing_error;
}
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1778,7 +1779,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
g_clear_error (&_inner_error_);
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1764 "PicasaPublishing.c"
+#line 1765 "PicasaPublishing.c"
}
#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp13_ = _tmp7_;
@@ -1790,7 +1791,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
response_doc = _tmp13_;
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_tmp7_);
-#line 1776 "PicasaPublishing.c"
+#line 1777 "PicasaPublishing.c"
}
goto __finally7;
__catch7_spit_publishing_publishing_error:
@@ -1816,7 +1817,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
_publishing_rest_support_transaction_unref0 (downcast_txn);
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1802 "PicasaPublishing.c"
+#line 1803 "PicasaPublishing.c"
}
__finally7:
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1831,7 +1832,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
g_clear_error (&_inner_error_);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1817 "PicasaPublishing.c"
+#line 1818 "PicasaPublishing.c"
}
{
PublishingPicasaAlbum** _tmp16_ = NULL;
@@ -1859,7 +1860,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1845 "PicasaPublishing.c"
+#line 1846 "PicasaPublishing.c"
goto __catch8_spit_publishing_publishing_error;
}
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1874,7 +1875,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
g_clear_error (&_inner_error_);
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1860 "PicasaPublishing.c"
+#line 1861 "PicasaPublishing.c"
}
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp21_ = _tmp16_;
@@ -1894,7 +1895,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
_response_albums_size_ = response_albums_length1;
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 1880 "PicasaPublishing.c"
+#line 1881 "PicasaPublishing.c"
}
goto __finally8;
__catch8_spit_publishing_publishing_error:
@@ -1922,7 +1923,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
_publishing_rest_support_transaction_unref0 (downcast_txn);
#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1908 "PicasaPublishing.c"
+#line 1909 "PicasaPublishing.c"
}
__finally8:
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1939,7 +1940,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
g_clear_error (&_inner_error_);
#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1925 "PicasaPublishing.c"
+#line 1926 "PicasaPublishing.c"
}
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp24_ = response_albums;
@@ -1947,7 +1948,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
_tmp24__length1 = response_albums_length1;
#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp24__length1 != 1) {
-#line 1933 "PicasaPublishing.c"
+#line 1934 "PicasaPublishing.c"
SpitPublishingPluginHost* _tmp25_ = NULL;
GError* _tmp26_ = NULL;
GError* _tmp27_ = NULL;
@@ -1970,7 +1971,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
_publishing_rest_support_transaction_unref0 (downcast_txn);
#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 1955 "PicasaPublishing.c"
+#line 1956 "PicasaPublishing.c"
}
#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp28_ = self->priv->publishing_parameters;
@@ -1992,7 +1993,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 1977 "PicasaPublishing.c"
+#line 1978 "PicasaPublishing.c"
}
@@ -2029,7 +2030,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_error (Publishi
if (!_tmp4_) {
#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2014 "PicasaPublishing.c"
+#line 2015 "PicasaPublishing.c"
}
#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp5_ = bad_txn;
@@ -2048,7 +2049,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_error (Publishi
_tmp9_ = err;
#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 2032 "PicasaPublishing.c"
+#line 2033 "PicasaPublishing.c"
}
@@ -2069,7 +2070,7 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish
if (!_tmp0_) {
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2053 "PicasaPublishing.c"
+#line 2054 "PicasaPublishing.c"
}
#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1_ = completed_fraction;
@@ -2092,21 +2093,21 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish
_tmp5_ = completed_fraction;
#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2075 "PicasaPublishing.c"
+#line 2076 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_upload_complete ((PublishingPicasaPicasaPublisher*) self, _sender, num_photos_published);
-#line 2082 "PicasaPublishing.c"
+#line 2083 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_upload_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 2089 "PicasaPublishing.c"
+#line 2090 "PicasaPublishing.c"
}
@@ -2127,7 +2128,7 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic
if (!_tmp0_) {
#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2110 "PicasaPublishing.c"
+#line 2111 "PicasaPublishing.c"
}
#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1_ = num_published;
@@ -2148,7 +2149,7 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic
g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_show_success_pane (self);
-#line 2130 "PicasaPublishing.c"
+#line 2131 "PicasaPublishing.c"
}
@@ -2172,7 +2173,7 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa
if (!_tmp0_) {
#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2154 "PicasaPublishing.c"
+#line 2155 "PicasaPublishing.c"
}
#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1_ = err;
@@ -2199,14 +2200,14 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa
_tmp8_ = err;
#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2180 "PicasaPublishing.c"
+#line 2181 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_service_welcome_login ((PublishingPicasaPicasaPublisher*) self);
-#line 2187 "PicasaPublishing.c"
+#line 2188 "PicasaPublishing.c"
}
@@ -2220,7 +2221,7 @@ static void publishing_picasa_picasa_publisher_do_show_service_welcome_pane (Pub
_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_PICASA_SERVICE_WELCOME_MESSAGE, _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 2201 "PicasaPublishing.c"
+#line 2202 "PicasaPublishing.c"
}
@@ -2262,7 +2263,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2242 "PicasaPublishing.c"
+#line 2243 "PicasaPublishing.c"
{
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2270,7 +2271,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2250 "PicasaPublishing.c"
+#line 2251 "PicasaPublishing.c"
goto __catch9_spit_publishing_publishing_error;
}
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2281,7 +2282,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
g_clear_error (&_inner_error_);
#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2261 "PicasaPublishing.c"
+#line 2262 "PicasaPublishing.c"
}
}
goto __finally9;
@@ -2299,7 +2300,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
publishing_picasa_picasa_publisher_on_initial_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (err);
-#line 2279 "PicasaPublishing.c"
+#line 2280 "PicasaPublishing.c"
}
__finally9:
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2312,11 +2313,11 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
g_clear_error (&_inner_error_);
#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2292 "PicasaPublishing.c"
+#line 2293 "PicasaPublishing.c"
}
#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2296 "PicasaPublishing.c"
+#line 2297 "PicasaPublishing.c"
}
@@ -2330,7 +2331,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_debug ("PicasaPublishing.vala:327: ACTION: parsing account and album informati" \
"on from server response XML");
-#line 2309 "PicasaPublishing.c"
+#line 2310 "PicasaPublishing.c"
{
PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL;
@@ -2357,7 +2358,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2336 "PicasaPublishing.c"
+#line 2337 "PicasaPublishing.c"
goto __catch10_spit_publishing_publishing_error;
}
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2368,7 +2369,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2347 "PicasaPublishing.c"
+#line 2348 "PicasaPublishing.c"
}
#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp6_ = _tmp0_;
@@ -2380,7 +2381,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
response_doc = _tmp6_;
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2359 "PicasaPublishing.c"
+#line 2360 "PicasaPublishing.c"
}
goto __finally10;
__catch10_spit_publishing_publishing_error:
@@ -2404,7 +2405,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2383 "PicasaPublishing.c"
+#line 2384 "PicasaPublishing.c"
}
__finally10:
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2417,7 +2418,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2396 "PicasaPublishing.c"
+#line 2397 "PicasaPublishing.c"
}
{
PublishingPicasaAlbum** _tmp9_ = NULL;
@@ -2444,7 +2445,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2423 "PicasaPublishing.c"
+#line 2424 "PicasaPublishing.c"
goto __catch11_spit_publishing_publishing_error;
}
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2455,7 +2456,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2434 "PicasaPublishing.c"
+#line 2435 "PicasaPublishing.c"
}
#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp14_ = self->priv->publishing_parameters;
@@ -2463,7 +2464,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
publishing_picasa_publishing_parameters_set_albums (_tmp14_, _tmp9_, _tmp9__length1);
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 2442 "PicasaPublishing.c"
+#line 2443 "PicasaPublishing.c"
}
goto __finally11;
__catch11_spit_publishing_publishing_error:
@@ -2487,7 +2488,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2466 "PicasaPublishing.c"
+#line 2467 "PicasaPublishing.c"
}
__finally11:
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2500,27 +2501,27 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
g_clear_error (&_inner_error_);
#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2479 "PicasaPublishing.c"
+#line 2480 "PicasaPublishing.c"
}
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_show_publishing_options_pane (self);
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2485 "PicasaPublishing.c"
+#line 2486 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_publishing_options_publish ((PublishingPicasaPicasaPublisher*) self);
-#line 2492 "PicasaPublishing.c"
+#line 2493 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_publishing_options_logout ((PublishingPicasaPicasaPublisher*) self);
-#line 2499 "PicasaPublishing.c"
+#line 2500 "PicasaPublishing.c"
}
@@ -2545,7 +2546,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
_tmp0_ = gtk_builder_new ();
#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
builder = _tmp0_;
-#line 2524 "PicasaPublishing.c"
+#line 2525 "PicasaPublishing.c"
{
GtkBuilder* _tmp1_ = NULL;
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2554,7 +2555,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "picasa_publishing_options_pane.ui", &_inner_error_);
#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2533 "PicasaPublishing.c"
+#line 2534 "PicasaPublishing.c"
goto __catch12_g_error;
}
}
@@ -2597,7 +2598,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
_g_object_unref0 (builder);
#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2575 "PicasaPublishing.c"
+#line 2576 "PicasaPublishing.c"
}
__finally12:
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2610,7 +2611,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
g_clear_error (&_inner_error_);
#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2588 "PicasaPublishing.c"
+#line 2589 "PicasaPublishing.c"
}
#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp8_ = builder;
@@ -2642,7 +2643,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
_g_object_unref0 (opts_pane);
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (builder);
-#line 2620 "PicasaPublishing.c"
+#line 2621 "PicasaPublishing.c"
}
@@ -2709,7 +2710,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2686 "PicasaPublishing.c"
+#line 2687 "PicasaPublishing.c"
{
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2717,7 +2718,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2694 "PicasaPublishing.c"
+#line 2695 "PicasaPublishing.c"
goto __catch13_spit_publishing_publishing_error;
}
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2728,7 +2729,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
g_clear_error (&_inner_error_);
#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2705 "PicasaPublishing.c"
+#line 2706 "PicasaPublishing.c"
}
}
goto __finally13;
@@ -2749,7 +2750,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (err);
-#line 2726 "PicasaPublishing.c"
+#line 2727 "PicasaPublishing.c"
}
__finally13:
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2762,18 +2763,18 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
g_clear_error (&_inner_error_);
#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2739 "PicasaPublishing.c"
+#line 2740 "PicasaPublishing.c"
}
#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 2743 "PicasaPublishing.c"
+#line 2744 "PicasaPublishing.c"
}
static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete);
-#line 2750 "PicasaPublishing.c"
+#line 2751 "PicasaPublishing.c"
}
@@ -2846,7 +2847,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
if (!_tmp9_) {
#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2822 "PicasaPublishing.c"
+#line 2823 "PicasaPublishing.c"
}
#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -2892,7 +2893,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2868 "PicasaPublishing.c"
+#line 2869 "PicasaPublishing.c"
}
@@ -2911,7 +2912,7 @@ static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingP
_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2887 "PicasaPublishing.c"
+#line 2888 "PicasaPublishing.c"
}
@@ -2942,7 +2943,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2918 "PicasaPublishing.c"
+#line 2919 "PicasaPublishing.c"
}
@@ -2958,7 +2959,7 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
result = _tmp0_;
#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 2934 "PicasaPublishing.c"
+#line 2935 "PicasaPublishing.c"
}
@@ -2976,7 +2977,7 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport
if (_tmp0_) {
#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 2952 "PicasaPublishing.c"
+#line 2953 "PicasaPublishing.c"
}
#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->running = TRUE;
@@ -2986,14 +2987,14 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport
if (_tmp1_ == NULL) {
#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2962 "PicasaPublishing.c"
+#line 2963 "PicasaPublishing.c"
} else {
const gchar* _tmp2_ = NULL;
#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp2_ = self->priv->refresh_token;
#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 2969 "PicasaPublishing.c"
+#line 2970 "PicasaPublishing.c"
}
}
@@ -3016,7 +3017,7 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG
_publishing_rest_support_session_unref0 (_tmp1_);
#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->running = FALSE;
-#line 2992 "PicasaPublishing.c"
+#line 2993 "PicasaPublishing.c"
}
@@ -3037,14 +3038,14 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas
((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_picasa_picasa_publisher_real_stop;
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize;
-#line 3013 "PicasaPublishing.c"
+#line 3014 "PicasaPublishing.c"
}
static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) {
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self);
-#line 3020 "PicasaPublishing.c"
+#line 3021 "PicasaPublishing.c"
}
@@ -3066,7 +3067,7 @@ static void publishing_picasa_picasa_publisher_finalize (GObject* obj) {
_g_free0 (self->priv->refresh_token);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj);
-#line 3042 "PicasaPublishing.c"
+#line 3043 "PicasaPublishing.c"
}
@@ -3112,21 +3113,21 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con
self->url = _tmp3_;
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 3088 "PicasaPublishing.c"
+#line 3089 "PicasaPublishing.c"
}
PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) {
#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url);
-#line 3095 "PicasaPublishing.c"
+#line 3096 "PicasaPublishing.c"
}
static void publishing_picasa_value_album_init (GValue* value) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3102 "PicasaPublishing.c"
+#line 3103 "PicasaPublishing.c"
}
@@ -3135,7 +3136,7 @@ static void publishing_picasa_value_album_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_unref (value->data[0].v_pointer);
-#line 3111 "PicasaPublishing.c"
+#line 3112 "PicasaPublishing.c"
}
}
@@ -3145,11 +3146,11 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G
if (src_value->data[0].v_pointer) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer);
-#line 3121 "PicasaPublishing.c"
+#line 3122 "PicasaPublishing.c"
} else {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3125 "PicasaPublishing.c"
+#line 3126 "PicasaPublishing.c"
}
}
@@ -3157,37 +3158,37 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G
static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 3133 "PicasaPublishing.c"
+#line 3134 "PicasaPublishing.c"
}
static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 3140 "PicasaPublishing.c"
+#line 3141 "PicasaPublishing.c"
PublishingPicasaAlbum* object;
object = collect_values[0].v_pointer;
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3147 "PicasaPublishing.c"
+#line 3148 "PicasaPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 3151 "PicasaPublishing.c"
+#line 3152 "PicasaPublishing.c"
}
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 3155 "PicasaPublishing.c"
+#line 3156 "PicasaPublishing.c"
} else {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3159 "PicasaPublishing.c"
+#line 3160 "PicasaPublishing.c"
}
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 3163 "PicasaPublishing.c"
+#line 3164 "PicasaPublishing.c"
}
@@ -3198,25 +3199,25 @@ static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, gu
if (!object_p) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3174 "PicasaPublishing.c"
+#line 3175 "PicasaPublishing.c"
}
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!value->data[0].v_pointer) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = NULL;
-#line 3180 "PicasaPublishing.c"
+#line 3181 "PicasaPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 3184 "PicasaPublishing.c"
+#line 3185 "PicasaPublishing.c"
} else {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3188 "PicasaPublishing.c"
+#line 3189 "PicasaPublishing.c"
}
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 3192 "PicasaPublishing.c"
+#line 3193 "PicasaPublishing.c"
}
@@ -3230,7 +3231,7 @@ GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar*
G_PARAM_SPEC (spec)->value_type = object_type;
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 3206 "PicasaPublishing.c"
+#line 3207 "PicasaPublishing.c"
}
@@ -3239,7 +3240,7 @@ gpointer publishing_picasa_value_get_album (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 3215 "PicasaPublishing.c"
+#line 3216 "PicasaPublishing.c"
}
@@ -3259,17 +3260,17 @@ void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3235 "PicasaPublishing.c"
+#line 3236 "PicasaPublishing.c"
} else {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3239 "PicasaPublishing.c"
+#line 3240 "PicasaPublishing.c"
}
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_unref (old);
-#line 3245 "PicasaPublishing.c"
+#line 3246 "PicasaPublishing.c"
}
}
@@ -3288,17 +3289,17 @@ void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 3264 "PicasaPublishing.c"
+#line 3265 "PicasaPublishing.c"
} else {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3268 "PicasaPublishing.c"
+#line 3269 "PicasaPublishing.c"
}
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_unref (old);
-#line 3274 "PicasaPublishing.c"
+#line 3275 "PicasaPublishing.c"
}
}
@@ -3308,14 +3309,14 @@ static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * kla
publishing_picasa_album_parent_class = g_type_class_peek_parent (klass);
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize;
-#line 3284 "PicasaPublishing.c"
+#line 3285 "PicasaPublishing.c"
}
static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) {
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->ref_count = 1;
-#line 3291 "PicasaPublishing.c"
+#line 3292 "PicasaPublishing.c"
}
@@ -3329,7 +3330,7 @@ static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) {
_g_free0 (self->name);
#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->url);
-#line 3305 "PicasaPublishing.c"
+#line 3306 "PicasaPublishing.c"
}
@@ -3354,7 +3355,7 @@ gpointer publishing_picasa_album_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return instance;
-#line 3330 "PicasaPublishing.c"
+#line 3331 "PicasaPublishing.c"
}
@@ -3367,7 +3368,7 @@ void publishing_picasa_album_unref (gpointer instance) {
PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self);
#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3343 "PicasaPublishing.c"
+#line 3344 "PicasaPublishing.c"
}
}
@@ -3383,14 +3384,14 @@ PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_tra
self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 3359 "PicasaPublishing.c"
+#line 3360 "PicasaPublishing.c"
}
PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session);
-#line 3366 "PicasaPublishing.c"
+#line 3367 "PicasaPublishing.c"
}
@@ -3418,7 +3419,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
if (g_strcmp0 (_tmp4_, "feed") == 0) {
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp2_ = TRUE;
-#line 3394 "PicasaPublishing.c"
+#line 3395 "PicasaPublishing.c"
} else {
xmlNode* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -3428,7 +3429,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
_tmp6_ = _tmp5_->name;
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 3404 "PicasaPublishing.c"
+#line 3405 "PicasaPublishing.c"
}
#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp2_) {
@@ -3436,7 +3437,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
result = NULL;
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 3412 "PicasaPublishing.c"
+#line 3413 "PicasaPublishing.c"
} else {
gchar* _tmp7_ = NULL;
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3445,7 +3446,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
result = _tmp7_;
#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 3421 "PicasaPublishing.c"
+#line 3422 "PicasaPublishing.c"
}
}
@@ -3453,7 +3454,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) {
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3429 "PicasaPublishing.c"
+#line 3430 "PicasaPublishing.c"
}
@@ -3503,11 +3504,11 @@ PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_trans
if (_tmp3_) {
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1_ = "public";
-#line 3479 "PicasaPublishing.c"
+#line 3480 "PicasaPublishing.c"
} else {
#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1_ = "private";
-#line 3483 "PicasaPublishing.c"
+#line 3484 "PicasaPublishing.c"
}
#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp4_ = parameters;
@@ -3535,21 +3536,21 @@ PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_trans
_g_free0 (post_body);
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 3511 "PicasaPublishing.c"
+#line 3512 "PicasaPublishing.c"
}
PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters) {
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_album_creation_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, session, parameters);
-#line 3518 "PicasaPublishing.c"
+#line 3519 "PicasaPublishing.c"
}
static void publishing_picasa_album_creation_transaction_class_init (PublishingPicasaAlbumCreationTransactionClass * klass) {
#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_album_creation_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3525 "PicasaPublishing.c"
+#line 3526 "PicasaPublishing.c"
}
@@ -3572,14 +3573,14 @@ GType publishing_picasa_album_creation_transaction_get_type (void) {
static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3548 "PicasaPublishing.c"
+#line 3549 "PicasaPublishing.c"
}
static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) {
#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_picasa_publishing_parameters_ref (self) : NULL;
-#line 3555 "PicasaPublishing.c"
+#line 3556 "PicasaPublishing.c"
}
@@ -3657,11 +3658,11 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
if (_tmp14_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp12_ = "video/mpeg";
-#line 3633 "PicasaPublishing.c"
+#line 3634 "PicasaPublishing.c"
} else {
#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp12_ = "image/jpeg";
-#line 3637 "PicasaPublishing.c"
+#line 3638 "PicasaPublishing.c"
}
#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp15_ = g_strdup (_tmp12_);
@@ -3671,14 +3672,14 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
self->priv->mime_type = _tmp15_;
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 3647 "PicasaPublishing.c"
+#line 3648 "PicasaPublishing.c"
}
PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3654 "PicasaPublishing.c"
+#line 3655 "PicasaPublishing.c"
}
@@ -3701,7 +3702,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 3677 "PicasaPublishing.c"
+#line 3678 "PicasaPublishing.c"
glong _tmp4_ = 0L;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -3709,7 +3710,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 3685 "PicasaPublishing.c"
+#line 3686 "PicasaPublishing.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -3721,7 +3722,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 3697 "PicasaPublishing.c"
+#line 3698 "PicasaPublishing.c"
}
}
@@ -3745,21 +3746,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 3721 "PicasaPublishing.c"
+#line 3722 "PicasaPublishing.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 3727 "PicasaPublishing.c"
+#line 3728 "PicasaPublishing.c"
} else {
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 3731 "PicasaPublishing.c"
+#line 3732 "PicasaPublishing.c"
}
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 3735 "PicasaPublishing.c"
+#line 3736 "PicasaPublishing.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
@@ -3771,7 +3772,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 3747 "PicasaPublishing.c"
+#line 3748 "PicasaPublishing.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -3781,13 +3782,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 3757 "PicasaPublishing.c"
+#line 3758 "PicasaPublishing.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 3763 "PicasaPublishing.c"
+#line 3764 "PicasaPublishing.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
@@ -3801,7 +3802,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 3777 "PicasaPublishing.c"
+#line 3778 "PicasaPublishing.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
@@ -3811,13 +3812,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 3787 "PicasaPublishing.c"
+#line 3788 "PicasaPublishing.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 3793 "PicasaPublishing.c"
+#line 3794 "PicasaPublishing.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3826,7 +3827,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 3802 "PicasaPublishing.c"
+#line 3803 "PicasaPublishing.c"
}
#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -3846,7 +3847,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 3822 "PicasaPublishing.c"
+#line 3823 "PicasaPublishing.c"
}
@@ -3863,7 +3864,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 3839 "PicasaPublishing.c"
+#line 3840 "PicasaPublishing.c"
}
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = str_array;
@@ -3873,7 +3874,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 3849 "PicasaPublishing.c"
+#line 3850 "PicasaPublishing.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -3883,13 +3884,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 3859 "PicasaPublishing.c"
+#line 3860 "PicasaPublishing.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 3865 "PicasaPublishing.c"
+#line 3866 "PicasaPublishing.c"
} else {
gboolean _tmp5_ = FALSE;
gchar** _tmp6_ = NULL;
@@ -3900,7 +3901,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 3876 "PicasaPublishing.c"
+#line 3877 "PicasaPublishing.c"
gchar** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
const gchar* _tmp8_ = NULL;
@@ -3912,19 +3913,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 3888 "PicasaPublishing.c"
+#line 3889 "PicasaPublishing.c"
} else {
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = FALSE;
-#line 3892 "PicasaPublishing.c"
+#line 3893 "PicasaPublishing.c"
}
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp5_;
-#line 3896 "PicasaPublishing.c"
+#line 3897 "PicasaPublishing.c"
}
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 3900 "PicasaPublishing.c"
+#line 3901 "PicasaPublishing.c"
gint i = 0;
gsize len = 0UL;
gint _tmp31_ = 0;
@@ -3947,7 +3948,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 3923 "PicasaPublishing.c"
+#line 3924 "PicasaPublishing.c"
{
gboolean _tmp9_ = FALSE;
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3956,7 +3957,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 3932 "PicasaPublishing.c"
+#line 3933 "PicasaPublishing.c"
gboolean _tmp11_ = FALSE;
gboolean _tmp12_ = FALSE;
gchar** _tmp13_ = NULL;
@@ -3969,13 +3970,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 3945 "PicasaPublishing.c"
+#line 3946 "PicasaPublishing.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 3951 "PicasaPublishing.c"
+#line 3952 "PicasaPublishing.c"
}
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = FALSE;
@@ -3985,7 +3986,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 3961 "PicasaPublishing.c"
+#line 3962 "PicasaPublishing.c"
gint _tmp14_ = 0;
gchar** _tmp15_ = NULL;
gint _tmp15__length1 = 0;
@@ -3997,17 +3998,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 3973 "PicasaPublishing.c"
+#line 3974 "PicasaPublishing.c"
} else {
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 3977 "PicasaPublishing.c"
+#line 3978 "PicasaPublishing.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 3983 "PicasaPublishing.c"
+#line 3984 "PicasaPublishing.c"
} else {
gboolean _tmp16_ = FALSE;
gchar** _tmp17_ = NULL;
@@ -4018,7 +4019,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 3994 "PicasaPublishing.c"
+#line 3995 "PicasaPublishing.c"
gchar** _tmp18_ = NULL;
gint _tmp18__length1 = 0;
gint _tmp19_ = 0;
@@ -4033,21 +4034,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 4009 "PicasaPublishing.c"
+#line 4010 "PicasaPublishing.c"
} else {
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = FALSE;
-#line 4013 "PicasaPublishing.c"
+#line 4014 "PicasaPublishing.c"
}
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = _tmp16_;
-#line 4017 "PicasaPublishing.c"
+#line 4018 "PicasaPublishing.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 4023 "PicasaPublishing.c"
+#line 4024 "PicasaPublishing.c"
}
#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = str_array;
@@ -4059,7 +4060,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 4035 "PicasaPublishing.c"
+#line 4036 "PicasaPublishing.c"
gchar** _tmp25_ = NULL;
gint _tmp25__length1 = 0;
gint _tmp26_ = 0;
@@ -4080,24 +4081,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 4056 "PicasaPublishing.c"
+#line 4057 "PicasaPublishing.c"
} else {
#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = 0;
-#line 4060 "PicasaPublishing.c"
+#line 4061 "PicasaPublishing.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 4066 "PicasaPublishing.c"
+#line 4067 "PicasaPublishing.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 4073 "PicasaPublishing.c"
+#line 4074 "PicasaPublishing.c"
gchar* _tmp32_ = NULL;
#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp32_ = g_strdup ("");
@@ -4105,7 +4106,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 4081 "PicasaPublishing.c"
+#line 4082 "PicasaPublishing.c"
}
#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp33_ = i;
@@ -4143,7 +4144,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 4119 "PicasaPublishing.c"
+#line 4120 "PicasaPublishing.c"
{
gboolean _tmp46_ = FALSE;
#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4152,7 +4153,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 4128 "PicasaPublishing.c"
+#line 4129 "PicasaPublishing.c"
gint _tmp48_ = 0;
gchar** _tmp49_ = NULL;
gint _tmp49__length1 = 0;
@@ -4168,13 +4169,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 4144 "PicasaPublishing.c"
+#line 4145 "PicasaPublishing.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 4150 "PicasaPublishing.c"
+#line 4151 "PicasaPublishing.c"
}
#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = FALSE;
@@ -4188,7 +4189,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 4164 "PicasaPublishing.c"
+#line 4165 "PicasaPublishing.c"
}
#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp50_ = ptr;
@@ -4208,7 +4209,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 4184 "PicasaPublishing.c"
+#line 4185 "PicasaPublishing.c"
gchar** _tmp57_ = NULL;
gint _tmp57__length1 = 0;
gint _tmp58_ = 0;
@@ -4223,11 +4224,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 4199 "PicasaPublishing.c"
+#line 4200 "PicasaPublishing.c"
} else {
#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = "";
-#line 4203 "PicasaPublishing.c"
+#line 4204 "PicasaPublishing.c"
}
#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp60_ = ptr;
@@ -4235,7 +4236,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 4211 "PicasaPublishing.c"
+#line 4212 "PicasaPublishing.c"
}
}
#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4246,7 +4247,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 4222 "PicasaPublishing.c"
+#line 4223 "PicasaPublishing.c"
} else {
gchar* _tmp63_ = NULL;
#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4255,7 +4256,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 4231 "PicasaPublishing.c"
+#line 4232 "PicasaPublishing.c"
}
}
@@ -4300,27 +4301,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 4276 "PicasaPublishing.c"
+#line 4277 "PicasaPublishing.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 4282 "PicasaPublishing.c"
+#line 4283 "PicasaPublishing.c"
+}
+
+
+static guint8* _vala_array_dup5 (guint8* self, int length) {
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+ return g_memdup (self, length * sizeof (guint8));
+#line 4290 "PicasaPublishing.c"
}
static void _vala_SoupBuffer_free (SoupBuffer* self) {
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 4289 "PicasaPublishing.c"
+#line 4297 "PicasaPublishing.c"
}
static void _vala_SoupMultipart_free (SoupMultipart* self) {
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 4296 "PicasaPublishing.c"
+#line 4304 "PicasaPublishing.c"
}
@@ -4360,38 +4368,40 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
gint _tmp61__length1 = 0;
guint8* _tmp62_ = NULL;
gint _tmp62__length1 = 0;
- SoupBuffer* _tmp63_ = NULL;
- SoupMultipart* _tmp64_ = NULL;
- SoupBuffer* _tmp65_ = NULL;
+ guint8* _tmp63_ = NULL;
+ gint _tmp63__length1 = 0;
+ SoupBuffer* _tmp64_ = NULL;
+ SoupMultipart* _tmp65_ = NULL;
+ SoupBuffer* _tmp66_ = NULL;
guint8* photo_data = NULL;
- GMappedFile* _tmp87_ = NULL;
- gchar* _tmp88_ = NULL;
+ GMappedFile* _tmp88_ = NULL;
+ gchar* _tmp89_ = NULL;
gint photo_data_length1 = 0;
gint _photo_data_size_ = 0;
- GMappedFile* _tmp89_ = NULL;
- gsize _tmp90_ = 0UL;
- gint _tmp91_ = 0;
+ GMappedFile* _tmp90_ = NULL;
+ gsize _tmp91_ = 0UL;
+ gint _tmp92_ = 0;
SoupBuffer* bindable_data = NULL;
- SoupBuffer* _tmp92_ = NULL;
- SoupMultipart* _tmp93_ = NULL;
- SpitPublishingPublishable* _tmp94_ = NULL;
- GFile* _tmp95_ = NULL;
+ SoupBuffer* _tmp93_ = NULL;
+ SoupMultipart* _tmp94_ = NULL;
+ SpitPublishingPublishable* _tmp95_ = NULL;
GFile* _tmp96_ = NULL;
- gchar* _tmp97_ = NULL;
+ GFile* _tmp97_ = NULL;
gchar* _tmp98_ = NULL;
- const gchar* _tmp99_ = NULL;
+ gchar* _tmp99_ = NULL;
+ const gchar* _tmp100_ = NULL;
SoupMessage* outbound_message = NULL;
- gchar* _tmp100_ = NULL;
gchar* _tmp101_ = NULL;
- SoupMultipart* _tmp102_ = NULL;
- SoupMessage* _tmp103_ = NULL;
+ gchar* _tmp102_ = NULL;
+ SoupMultipart* _tmp103_ = NULL;
SoupMessage* _tmp104_ = NULL;
- SoupMessageHeaders* _tmp105_ = NULL;
- PublishingRESTSupportGoogleSession* _tmp106_ = NULL;
- gchar* _tmp107_ = NULL;
+ SoupMessage* _tmp105_ = NULL;
+ SoupMessageHeaders* _tmp106_ = NULL;
+ PublishingRESTSupportGoogleSession* _tmp107_ = NULL;
gchar* _tmp108_ = NULL;
gchar* _tmp109_ = NULL;
gchar* _tmp110_ = NULL;
+ gchar* _tmp111_ = NULL;
GError * _inner_error_ = NULL;
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -4415,7 +4425,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (_tmp4_);
#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp5_) {
-#line 4391 "PicasaPublishing.c"
+#line 4401 "PicasaPublishing.c"
SpitPublishingPublishable* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
@@ -4442,7 +4452,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (_tmp10_);
#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (_tmp8_);
-#line 4418 "PicasaPublishing.c"
+#line 4428 "PicasaPublishing.c"
}
#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp12_ = self->priv->publishable;
@@ -4464,7 +4474,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_tmp16__length1 = keywords_length1;
#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp16__length1 > 0) {
-#line 4440 "PicasaPublishing.c"
+#line 4450 "PicasaPublishing.c"
const gchar* _tmp47_ = NULL;
gchar* _tmp48_ = NULL;
const gchar* _tmp49_ = NULL;
@@ -4473,14 +4483,14 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
gint i = 0;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = 0;
-#line 4449 "PicasaPublishing.c"
+#line 4459 "PicasaPublishing.c"
{
gboolean _tmp17_ = FALSE;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp17_ = TRUE;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 4456 "PicasaPublishing.c"
+#line 4466 "PicasaPublishing.c"
gint _tmp19_ = 0;
gchar** _tmp20_ = NULL;
gint _tmp20__length1 = 0;
@@ -4497,13 +4507,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
gint _tmp39_ = 0;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!_tmp17_) {
-#line 4473 "PicasaPublishing.c"
+#line 4483 "PicasaPublishing.c"
gint _tmp18_ = 0;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp18_ = i;
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = _tmp18_ + 1;
-#line 4479 "PicasaPublishing.c"
+#line 4489 "PicasaPublishing.c"
}
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp17_ = FALSE;
@@ -4517,7 +4527,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
if (!(_tmp19_ < _tmp20__length1)) {
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 4493 "PicasaPublishing.c"
+#line 4503 "PicasaPublishing.c"
}
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp21_ = keywords;
@@ -4531,7 +4541,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_tmp24_ = g_str_has_prefix (_tmp23_, "/");
#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp24_) {
-#line 4507 "PicasaPublishing.c"
+#line 4517 "PicasaPublishing.c"
gchar** _tmp25_ = NULL;
gint _tmp25__length1 = 0;
gint _tmp26_ = 0;
@@ -4564,7 +4574,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_tmp_size_ = tmp_length1;
#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (_tmp29_);
-#line 4540 "PicasaPublishing.c"
+#line 4550 "PicasaPublishing.c"
} else {
gchar** _tmp32_ = NULL;
gint _tmp32__length1 = 0;
@@ -4590,7 +4600,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
tmp_length1 = _vala_array_length (_tmp35_);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp_size_ = tmp_length1;
-#line 4566 "PicasaPublishing.c"
+#line 4576 "PicasaPublishing.c"
}
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp37_ = keywords_string;
@@ -4600,7 +4610,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_tmp39_ = _tmp38_;
#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp39_ > 0) {
-#line 4576 "PicasaPublishing.c"
+#line 4586 "PicasaPublishing.c"
const gchar* _tmp40_ = NULL;
gchar** _tmp41_ = NULL;
gint _tmp41__length1 = 0;
@@ -4625,7 +4635,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
keywords_string = _tmp44_;
#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (_tmp43_);
-#line 4601 "PicasaPublishing.c"
+#line 4611 "PicasaPublishing.c"
} else {
gchar** _tmp45_ = NULL;
gint _tmp45__length1 = 0;
@@ -4640,11 +4650,11 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (keywords_string);
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
keywords_string = _tmp46_;
-#line 4616 "PicasaPublishing.c"
+#line 4626 "PicasaPublishing.c"
}
#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 4620 "PicasaPublishing.c"
+#line 4630 "PicasaPublishing.c"
}
}
}
@@ -4664,7 +4674,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (keywords_string);
#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
keywords_string = _tmp50_;
-#line 4640 "PicasaPublishing.c"
+#line 4650 "PicasaPublishing.c"
}
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp51_ = self->priv->publishable;
@@ -4699,51 +4709,55 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp62__length1 = _tmp61__length1;
#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1);
+ _tmp63_ = (_tmp62_ != NULL) ? _vala_array_dup5 (_tmp62_, _tmp62__length1) : ((gpointer) _tmp62_);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+ _tmp63__length1 = _tmp62__length1;
#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- metadata_buffer = _tmp63_;
+ _tmp64_ = soup_buffer_new_take (_tmp63_, _tmp63__length1);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+ metadata_buffer = _tmp64_;
#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp64_ = message_parts;
+ _tmp65_ = message_parts;
#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp65_ = metadata_buffer;
+ _tmp66_ = metadata_buffer;
#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
-#line 4684 "PicasaPublishing.c"
+ soup_multipart_append_form_file (_tmp65_, "", "", "application/atom+xml", _tmp66_);
+#line 4698 "PicasaPublishing.c"
{
- GMappedFile* _tmp66_ = NULL;
- SpitPublishingPublishable* _tmp67_ = NULL;
- GFile* _tmp68_ = NULL;
+ GMappedFile* _tmp67_ = NULL;
+ SpitPublishingPublishable* _tmp68_ = NULL;
GFile* _tmp69_ = NULL;
- gchar* _tmp70_ = NULL;
+ GFile* _tmp70_ = NULL;
gchar* _tmp71_ = NULL;
- GMappedFile* _tmp72_ = NULL;
+ gchar* _tmp72_ = NULL;
GMappedFile* _tmp73_ = NULL;
GMappedFile* _tmp74_ = NULL;
+ GMappedFile* _tmp75_ = NULL;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp67_ = self->priv->publishable;
+ _tmp68_ = self->priv->publishable;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_);
+ _tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp69_ = _tmp68_;
+ _tmp70_ = _tmp69_;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp70_ = g_file_get_path (_tmp69_);
+ _tmp71_ = g_file_get_path (_tmp70_);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp71_ = _tmp70_;
+ _tmp72_ = _tmp71_;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_);
+ _tmp73_ = g_mapped_file_new (_tmp72_, FALSE, &_inner_error_);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp73_ = _tmp72_;
+ _tmp74_ = _tmp73_;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp71_);
+ _g_free0 (_tmp72_);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_object_unref0 (_tmp69_);
+ _g_object_unref0 (_tmp70_);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp66_ = _tmp73_;
+ _tmp67_ = _tmp74_;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4719 "PicasaPublishing.c"
+#line 4733 "PicasaPublishing.c"
goto __catch14_g_file_error;
}
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4764,80 +4778,80 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4740 "PicasaPublishing.c"
+#line 4754 "PicasaPublishing.c"
}
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp74_ = _tmp66_;
+ _tmp75_ = _tmp67_;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp66_ = NULL;
+ _tmp67_ = NULL;
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_mapped_file_unref0 (self->priv->mapped_file);
#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- self->priv->mapped_file = _tmp74_;
+ self->priv->mapped_file = _tmp75_;
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_mapped_file_unref0 (_tmp66_);
-#line 4752 "PicasaPublishing.c"
+ _g_mapped_file_unref0 (_tmp67_);
+#line 4766 "PicasaPublishing.c"
}
goto __finally14;
__catch14_g_file_error:
{
GError* e = NULL;
gchar* msg = NULL;
- SpitPublishingPublishable* _tmp75_ = NULL;
- GFile* _tmp76_ = NULL;
+ SpitPublishingPublishable* _tmp76_ = NULL;
GFile* _tmp77_ = NULL;
- gchar* _tmp78_ = NULL;
+ GFile* _tmp78_ = NULL;
gchar* _tmp79_ = NULL;
- GError* _tmp80_ = NULL;
- const gchar* _tmp81_ = NULL;
- gchar* _tmp82_ = NULL;
+ gchar* _tmp80_ = NULL;
+ GError* _tmp81_ = NULL;
+ const gchar* _tmp82_ = NULL;
gchar* _tmp83_ = NULL;
- const gchar* _tmp84_ = NULL;
+ gchar* _tmp84_ = NULL;
const gchar* _tmp85_ = NULL;
- GError* _tmp86_ = NULL;
+ const gchar* _tmp86_ = NULL;
+ GError* _tmp87_ = NULL;
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
e = _inner_error_;
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_inner_error_ = NULL;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp75_ = self->priv->publishable;
+ _tmp76_ = self->priv->publishable;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_);
+ _tmp77_ = spit_publishing_publishable_get_serialized_file (_tmp76_);
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp77_ = _tmp76_;
+ _tmp78_ = _tmp77_;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp78_ = g_file_get_path (_tmp77_);
+ _tmp79_ = g_file_get_path (_tmp78_);
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp79_ = _tmp78_;
+ _tmp80_ = _tmp79_;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp80_ = e;
+ _tmp81_ = e;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp81_ = _tmp80_->message;
+ _tmp82_ = _tmp81_->message;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp82_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp79_, _tmp81_);
+ _tmp83_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp80_, _tmp82_);
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp83_ = _tmp82_;
+ _tmp84_ = _tmp83_;
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp79_);
+ _g_free0 (_tmp80_);
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_object_unref0 (_tmp77_);
+ _g_object_unref0 (_tmp78_);
#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- msg = _tmp83_;
+ msg = _tmp84_;
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp84_ = msg;
+ _tmp85_ = msg;
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- g_warning ("PicasaPublishing.vala:574: %s", _tmp84_);
+ g_warning ("PicasaPublishing.vala:574: %s", _tmp85_);
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp85_ = msg;
+ _tmp86_ = msg;
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp86_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp85_);
+ _tmp87_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp86_);
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _inner_error_ = _tmp86_;
+ _inner_error_ = _tmp87_;
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (msg);
#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_error_free0 (e);
-#line 4813 "PicasaPublishing.c"
+#line 4827 "PicasaPublishing.c"
goto __finally14;
}
__finally14:
@@ -4861,7 +4875,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
__vala_SoupMultipart_free0 (message_parts);
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4837 "PicasaPublishing.c"
+#line 4851 "PicasaPublishing.c"
} else {
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
__vala_SoupBuffer_free0 (metadata_buffer);
@@ -4881,83 +4895,83 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4857 "PicasaPublishing.c"
+#line 4871 "PicasaPublishing.c"
}
}
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp87_ = self->priv->mapped_file;
+ _tmp88_ = self->priv->mapped_file;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp88_ = g_mapped_file_get_contents (_tmp87_);
+ _tmp89_ = g_mapped_file_get_contents (_tmp88_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- photo_data = (guint8*) _tmp88_;
+ photo_data = (guint8*) _tmp89_;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
photo_data_length1 = -1;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_photo_data_size_ = photo_data_length1;
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp89_ = self->priv->mapped_file;
+ _tmp90_ = self->priv->mapped_file;
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp90_ = g_mapped_file_get_length (_tmp89_);
+ _tmp91_ = g_mapped_file_get_length (_tmp90_);
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- photo_data_length1 = (gint) _tmp90_;
+ photo_data_length1 = (gint) _tmp91_;
#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp91_ = photo_data_length1;
+ _tmp92_ = photo_data_length1;
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
+ _tmp93_ = soup_buffer_new_with_owner (photo_data, photo_data_length1, self, NULL);
#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- bindable_data = _tmp92_;
+ bindable_data = _tmp93_;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp93_ = message_parts;
+ _tmp94_ = message_parts;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp94_ = self->priv->publishable;
+ _tmp95_ = self->priv->publishable;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_);
+ _tmp96_ = spit_publishing_publishable_get_serialized_file (_tmp95_);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp96_ = _tmp95_;
+ _tmp97_ = _tmp96_;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp97_ = g_file_get_path (_tmp96_);
+ _tmp98_ = g_file_get_path (_tmp97_);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp98_ = _tmp97_;
+ _tmp99_ = _tmp98_;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp99_ = self->priv->mime_type;
+ _tmp100_ = self->priv->mime_type;
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data);
+ soup_multipart_append_form_file (_tmp94_, "", _tmp99_, _tmp100_, bindable_data);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp98_);
+ _g_free0 (_tmp99_);
#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_object_unref0 (_tmp96_);
+ _g_object_unref0 (_tmp97_);
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp100_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+ _tmp101_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp101_ = _tmp100_;
+ _tmp102_ = _tmp101_;
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp102_ = message_parts;
+ _tmp103_ = message_parts;
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_);
+ _tmp104_ = soup_form_request_new_from_multipart (_tmp102_, _tmp103_);
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp104_ = _tmp103_;
+ _tmp105_ = _tmp104_;
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp101_);
+ _g_free0 (_tmp102_);
#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- outbound_message = _tmp104_;
+ outbound_message = _tmp105_;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp105_ = outbound_message->request_headers;
+ _tmp106_ = outbound_message->request_headers;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp106_ = self->priv->session;
+ _tmp107_ = self->priv->session;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_);
+ _tmp108_ = publishing_rest_support_google_session_get_access_token (_tmp107_);
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp108_ = _tmp107_;
+ _tmp109_ = _tmp108_;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL);
+ _tmp110_ = g_strconcat ("Bearer ", _tmp109_, NULL);
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp110_ = _tmp109_;
+ _tmp111_ = _tmp110_;
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- soup_message_headers_append (_tmp105_, "Authorization", _tmp110_);
+ soup_message_headers_append (_tmp106_, "Authorization", _tmp111_);
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp110_);
+ _g_free0 (_tmp111_);
#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _g_free0 (_tmp108_);
+ _g_free0 (_tmp109_);
#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4988,7 +5002,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
__vala_SoupMultipart_free0 (message_parts);
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4964 "PicasaPublishing.c"
+#line 4978 "PicasaPublishing.c"
} else {
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_object_unref0 (outbound_message);
@@ -5012,7 +5026,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
g_clear_error (&_inner_error_);
#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return;
-#line 4988 "PicasaPublishing.c"
+#line 5002 "PicasaPublishing.c"
}
}
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5031,7 +5045,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
_g_free0 (summary);
#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 5007 "PicasaPublishing.c"
+#line 5021 "PicasaPublishing.c"
}
@@ -5044,14 +5058,14 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl
g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate));
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_picasa_upload_transaction_real_execute;
-#line 5020 "PicasaPublishing.c"
+#line 5034 "PicasaPublishing.c"
}
static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) {
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 5027 "PicasaPublishing.c"
+#line 5041 "PicasaPublishing.c"
}
@@ -5071,7 +5085,7 @@ static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupport
_g_mapped_file_unref0 (self->priv->mapped_file);
#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj);
-#line 5047 "PicasaPublishing.c"
+#line 5061 "PicasaPublishing.c"
}
@@ -5090,42 +5104,42 @@ GType publishing_picasa_upload_transaction_get_type (void) {
static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) {
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL;
-#line 5066 "PicasaPublishing.c"
+#line 5080 "PicasaPublishing.c"
}
static void _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5073 "PicasaPublishing.c"
+#line 5087 "PicasaPublishing.c"
}
static void _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_on_create_new_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5080 "PicasaPublishing.c"
+#line 5094 "PicasaPublishing.c"
}
static void _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_on_new_album_entry_changed ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5087 "PicasaPublishing.c"
+#line 5101 "PicasaPublishing.c"
}
static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5094 "PicasaPublishing.c"
+#line 5108 "PicasaPublishing.c"
}
static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5101 "PicasaPublishing.c"
+#line 5115 "PicasaPublishing.c"
}
@@ -5397,7 +5411,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
_tmp58_ = publishing_picasa_publishing_parameters_get_media_type (_tmp57_);
#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if ((_tmp58_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
-#line 5373 "PicasaPublishing.c"
+#line 5387 "PicasaPublishing.c"
GtkLabel* _tmp59_ = NULL;
const gchar* _tmp60_ = NULL;
GtkComboBoxText* _tmp61_ = NULL;
@@ -5416,7 +5430,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
_tmp62_ = self->priv->size_combo;
#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5392 "PicasaPublishing.c"
+#line 5406 "PicasaPublishing.c"
} else {
GtkLabel* _tmp63_ = NULL;
const gchar* _tmp64_ = NULL;
@@ -5437,7 +5451,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
_tmp65_ = self->priv->size_descriptions;
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp65__length1 = self->priv->size_descriptions_length1;
-#line 5413 "PicasaPublishing.c"
+#line 5427 "PicasaPublishing.c"
{
PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
gint desc_collection_length1 = 0;
@@ -5449,14 +5463,14 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
desc_collection_length1 = _tmp65__length1;
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (desc_it = 0; desc_it < _tmp65__length1; desc_it = desc_it + 1) {
-#line 5425 "PicasaPublishing.c"
+#line 5439 "PicasaPublishing.c"
PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp66_ = NULL;
PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL;
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp66_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
desc = _tmp66_;
-#line 5432 "PicasaPublishing.c"
+#line 5446 "PicasaPublishing.c"
{
GtkComboBoxText* _tmp67_ = NULL;
PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp68_ = NULL;
@@ -5471,7 +5485,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
gtk_combo_box_text_append_text (_tmp67_, _tmp69_);
#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_publishing_picasa_publishing_options_pane_size_description_unref0 (desc);
-#line 5447 "PicasaPublishing.c"
+#line 5461 "PicasaPublishing.c"
}
}
}
@@ -5491,7 +5505,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
_tmp74_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp73_);
#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), _tmp74_);
-#line 5467 "PicasaPublishing.c"
+#line 5481 "PicasaPublishing.c"
}
#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp75_ = self->priv->use_existing_radio;
@@ -5515,14 +5529,14 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
g_signal_connect_object (_tmp79_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 5491 "PicasaPublishing.c"
+#line 5505 "PicasaPublishing.c"
}
PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters) {
#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters);
-#line 5498 "PicasaPublishing.c"
+#line 5512 "PicasaPublishing.c"
}
@@ -5558,7 +5572,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp2_ >= 0) {
-#line 5534 "PicasaPublishing.c"
+#line 5548 "PicasaPublishing.c"
GtkComboBoxText* _tmp3_ = NULL;
gint _tmp4_ = 0;
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5567,11 +5581,11 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = _tmp4_;
-#line 5543 "PicasaPublishing.c"
+#line 5557 "PicasaPublishing.c"
} else {
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = 0;
-#line 5547 "PicasaPublishing.c"
+#line 5561 "PicasaPublishing.c"
}
#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
size_combo_last_active = _tmp0_;
@@ -5619,7 +5633,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
_tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp19_) {
-#line 5595 "PicasaPublishing.c"
+#line 5609 "PicasaPublishing.c"
PublishingPicasaPublishingParameters* _tmp20_ = NULL;
GtkEntry* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
@@ -5649,7 +5663,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
publishing_picasa_publishing_parameters_set_is_new_album_public (_tmp24_, _tmp26_);
#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_emit_by_name (self, "publish");
-#line 5625 "PicasaPublishing.c"
+#line 5639 "PicasaPublishing.c"
} else {
PublishingPicasaPublishingParameters* _tmp27_ = NULL;
PublishingPicasaAlbum** _tmp28_ = NULL;
@@ -5704,11 +5718,11 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp34_, _tmp39_);
#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_emit_by_name (self, "publish");
-#line 5680 "PicasaPublishing.c"
+#line 5694 "PicasaPublishing.c"
}
#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 5684 "PicasaPublishing.c"
+#line 5698 "PicasaPublishing.c"
}
@@ -5737,7 +5751,7 @@ static void publishing_picasa_publishing_options_pane_on_use_existing_radio_clic
_tmp3_ = self->priv->public_check;
#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5713 "PicasaPublishing.c"
+#line 5727 "PicasaPublishing.c"
}
@@ -5766,7 +5780,7 @@ static void publishing_picasa_publishing_options_pane_on_create_new_radio_clicke
_tmp3_ = self->priv->public_check;
#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 5742 "PicasaPublishing.c"
+#line 5756 "PicasaPublishing.c"
}
@@ -5775,7 +5789,7 @@ static void publishing_picasa_publishing_options_pane_on_logout_clicked (Publish
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_emit_by_name (self, "logout");
-#line 5751 "PicasaPublishing.c"
+#line 5765 "PicasaPublishing.c"
}
@@ -5798,7 +5812,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 5774 "PicasaPublishing.c"
+#line 5788 "PicasaPublishing.c"
}
@@ -5835,7 +5849,7 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens
_g_free0 (_tmp6_);
#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp7_) {
-#line 5811 "PicasaPublishing.c"
+#line 5825 "PicasaPublishing.c"
GtkRadioButton* _tmp8_ = NULL;
gboolean _tmp9_ = FALSE;
#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5844,11 +5858,11 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens
_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp3_ = _tmp9_;
-#line 5820 "PicasaPublishing.c"
+#line 5834 "PicasaPublishing.c"
} else {
#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp3_ = FALSE;
-#line 5824 "PicasaPublishing.c"
+#line 5838 "PicasaPublishing.c"
}
#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp10_ = self->priv->publish_button;
@@ -5856,7 +5870,7 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (album_name);
-#line 5832 "PicasaPublishing.c"
+#line 5846 "PicasaPublishing.c"
}
@@ -5865,7 +5879,7 @@ static void publishing_picasa_publishing_options_pane_on_new_album_entry_changed
g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 5841 "PicasaPublishing.c"
+#line 5855 "PicasaPublishing.c"
}
@@ -5876,13 +5890,13 @@ static void _vala_array_add13 (PublishingPicasaPublishingOptionsPaneSizeDescript
*size = (*size) ? (2 * (*size)) : 4;
#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5852 "PicasaPublishing.c"
+#line 5866 "PicasaPublishing.c"
}
#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5858 "PicasaPublishing.c"
+#line 5872 "PicasaPublishing.c"
}
@@ -5893,13 +5907,13 @@ static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescript
*size = (*size) ? (2 * (*size)) : 4;
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5869 "PicasaPublishing.c"
+#line 5883 "PicasaPublishing.c"
}
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5875 "PicasaPublishing.c"
+#line 5889 "PicasaPublishing.c"
}
@@ -5910,13 +5924,13 @@ static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescript
*size = (*size) ? (2 * (*size)) : 4;
#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5886 "PicasaPublishing.c"
+#line 5900 "PicasaPublishing.c"
}
#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5892 "PicasaPublishing.c"
+#line 5906 "PicasaPublishing.c"
}
@@ -5927,13 +5941,13 @@ static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescript
*size = (*size) ? (2 * (*size)) : 4;
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5903 "PicasaPublishing.c"
+#line 5917 "PicasaPublishing.c"
}
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5909 "PicasaPublishing.c"
+#line 5923 "PicasaPublishing.c"
}
@@ -5944,13 +5958,13 @@ static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescript
*size = (*size) ? (2 * (*size)) : 4;
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5920 "PicasaPublishing.c"
+#line 5934 "PicasaPublishing.c"
}
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[(*length)++] = value;
#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
(*array)[*length] = NULL;
-#line 5926 "PicasaPublishing.c"
+#line 5940 "PicasaPublishing.c"
}
@@ -6050,13 +6064,13 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
if (result_length1) {
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*result_length1 = _tmp16__length1;
-#line 6026 "PicasaPublishing.c"
+#line 6040 "PicasaPublishing.c"
}
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = _tmp16_;
#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6032 "PicasaPublishing.c"
+#line 6046 "PicasaPublishing.c"
}
@@ -6093,19 +6107,19 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
albums_length1 = _tmp3_;
#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_albums_size_ = albums_length1;
-#line 6069 "PicasaPublishing.c"
+#line 6083 "PicasaPublishing.c"
{
gint i = 0;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = 0;
-#line 6074 "PicasaPublishing.c"
+#line 6088 "PicasaPublishing.c"
{
gboolean _tmp5_ = FALSE;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp5_ = TRUE;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
while (TRUE) {
-#line 6081 "PicasaPublishing.c"
+#line 6095 "PicasaPublishing.c"
gint _tmp7_ = 0;
PublishingPicasaAlbum** _tmp8_ = NULL;
gint _tmp8__length1 = 0;
@@ -6124,13 +6138,13 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
const gchar* _tmp19_ = NULL;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!_tmp5_) {
-#line 6100 "PicasaPublishing.c"
+#line 6114 "PicasaPublishing.c"
gint _tmp6_ = 0;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp6_ = i;
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
i = _tmp6_ + 1;
-#line 6106 "PicasaPublishing.c"
+#line 6120 "PicasaPublishing.c"
}
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp5_ = FALSE;
@@ -6144,7 +6158,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
if (!(_tmp7_ < _tmp8__length1)) {
#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
break;
-#line 6120 "PicasaPublishing.c"
+#line 6134 "PicasaPublishing.c"
}
#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp9_ = self->priv->existing_albums_combo;
@@ -6176,7 +6190,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
if (g_strcmp0 (_tmp18_, _tmp19_) == 0) {
#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp14_ = TRUE;
-#line 6152 "PicasaPublishing.c"
+#line 6166 "PicasaPublishing.c"
} else {
gboolean _tmp20_ = FALSE;
PublishingPicasaAlbum** _tmp21_ = NULL;
@@ -6196,31 +6210,31 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp24_ = _tmp23_->name;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (g_strcmp0 (_tmp24_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
-#line 6172 "PicasaPublishing.c"
+#line 6186 "PicasaPublishing.c"
gint _tmp25_ = 0;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp25_ = default_album_id;
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp20_ = _tmp25_ == -1;
-#line 6178 "PicasaPublishing.c"
+#line 6192 "PicasaPublishing.c"
} else {
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp20_ = FALSE;
-#line 6182 "PicasaPublishing.c"
+#line 6196 "PicasaPublishing.c"
}
#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp14_ = _tmp20_;
-#line 6186 "PicasaPublishing.c"
+#line 6200 "PicasaPublishing.c"
}
#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp14_) {
-#line 6190 "PicasaPublishing.c"
+#line 6204 "PicasaPublishing.c"
gint _tmp26_ = 0;
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp26_ = i;
#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
default_album_id = _tmp26_;
-#line 6196 "PicasaPublishing.c"
+#line 6210 "PicasaPublishing.c"
}
}
}
@@ -6231,7 +6245,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp27__length1 = albums_length1;
#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp27__length1 == 0) {
-#line 6207 "PicasaPublishing.c"
+#line 6221 "PicasaPublishing.c"
GtkComboBoxText* _tmp28_ = NULL;
GtkRadioButton* _tmp29_ = NULL;
GtkRadioButton* _tmp30_ = NULL;
@@ -6257,14 +6271,14 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp32_ = self->priv->new_album_entry;
#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_entry_set_text (_tmp32_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME);
-#line 6233 "PicasaPublishing.c"
+#line 6247 "PicasaPublishing.c"
} else {
gint _tmp33_ = 0;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp33_ = default_album_id;
#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (_tmp33_ >= 0) {
-#line 6240 "PicasaPublishing.c"
+#line 6254 "PicasaPublishing.c"
GtkRadioButton* _tmp34_ = NULL;
GtkComboBoxText* _tmp35_ = NULL;
gint _tmp36_ = 0;
@@ -6288,7 +6302,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp38_ = self->priv->public_check;
#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6264 "PicasaPublishing.c"
+#line 6278 "PicasaPublishing.c"
} else {
GtkRadioButton* _tmp39_ = NULL;
GtkComboBoxText* _tmp40_ = NULL;
@@ -6315,7 +6329,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
_tmp43_ = self->priv->public_check;
#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 6291 "PicasaPublishing.c"
+#line 6305 "PicasaPublishing.c"
}
}
#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6324,7 +6338,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (last_album);
-#line 6300 "PicasaPublishing.c"
+#line 6314 "PicasaPublishing.c"
}
@@ -6343,7 +6357,7 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi
result = _tmp1_;
#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6319 "PicasaPublishing.c"
+#line 6333 "PicasaPublishing.c"
}
@@ -6356,7 +6370,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_opti
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6332 "PicasaPublishing.c"
+#line 6346 "PicasaPublishing.c"
}
@@ -6366,7 +6380,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_installed (Sp
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_installed (self);
-#line 6342 "PicasaPublishing.c"
+#line 6356 "PicasaPublishing.c"
}
@@ -6374,7 +6388,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (
PublishingPicasaPublishingOptionsPane * self;
#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 6350 "PicasaPublishing.c"
+#line 6364 "PicasaPublishing.c"
}
@@ -6401,21 +6415,21 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_p
self->major_axis_pixels = _tmp2_;
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 6377 "PicasaPublishing.c"
+#line 6391 "PicasaPublishing.c"
}
static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) {
#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels);
-#line 6384 "PicasaPublishing.c"
+#line 6398 "PicasaPublishing.c"
}
static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6391 "PicasaPublishing.c"
+#line 6405 "PicasaPublishing.c"
}
@@ -6424,7 +6438,7 @@ static void publishing_picasa_publishing_options_pane_value_size_description_fre
if (value->data[0].v_pointer) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer);
-#line 6400 "PicasaPublishing.c"
+#line 6414 "PicasaPublishing.c"
}
}
@@ -6434,11 +6448,11 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop
if (src_value->data[0].v_pointer) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer);
-#line 6410 "PicasaPublishing.c"
+#line 6424 "PicasaPublishing.c"
} else {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 6414 "PicasaPublishing.c"
+#line 6428 "PicasaPublishing.c"
}
}
@@ -6446,37 +6460,37 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop
static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 6422 "PicasaPublishing.c"
+#line 6436 "PicasaPublishing.c"
}
static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 6429 "PicasaPublishing.c"
+#line 6443 "PicasaPublishing.c"
PublishingPicasaPublishingOptionsPaneSizeDescription* object;
object = collect_values[0].v_pointer;
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6436 "PicasaPublishing.c"
+#line 6450 "PicasaPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 6440 "PicasaPublishing.c"
+#line 6454 "PicasaPublishing.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object);
-#line 6444 "PicasaPublishing.c"
+#line 6458 "PicasaPublishing.c"
} else {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6448 "PicasaPublishing.c"
+#line 6462 "PicasaPublishing.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 6452 "PicasaPublishing.c"
+#line 6466 "PicasaPublishing.c"
}
@@ -6487,25 +6501,25 @@ static gchar* publishing_picasa_publishing_options_pane_value_size_description_l
if (!object_p) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6463 "PicasaPublishing.c"
+#line 6477 "PicasaPublishing.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!value->data[0].v_pointer) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = NULL;
-#line 6469 "PicasaPublishing.c"
+#line 6483 "PicasaPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 6473 "PicasaPublishing.c"
+#line 6487 "PicasaPublishing.c"
} else {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6477 "PicasaPublishing.c"
+#line 6491 "PicasaPublishing.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 6481 "PicasaPublishing.c"
+#line 6495 "PicasaPublishing.c"
}
@@ -6519,7 +6533,7 @@ static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_des
G_PARAM_SPEC (spec)->value_type = object_type;
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 6495 "PicasaPublishing.c"
+#line 6509 "PicasaPublishing.c"
}
@@ -6528,7 +6542,7 @@ static gpointer publishing_picasa_publishing_options_pane_value_get_size_descrip
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 6504 "PicasaPublishing.c"
+#line 6518 "PicasaPublishing.c"
}
@@ -6548,17 +6562,17 @@ static void publishing_picasa_publishing_options_pane_value_set_size_description
value->data[0].v_pointer = v_object;
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6524 "PicasaPublishing.c"
+#line 6538 "PicasaPublishing.c"
} else {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6528 "PicasaPublishing.c"
+#line 6542 "PicasaPublishing.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6534 "PicasaPublishing.c"
+#line 6548 "PicasaPublishing.c"
}
}
@@ -6577,17 +6591,17 @@ static void publishing_picasa_publishing_options_pane_value_take_size_descriptio
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 6553 "PicasaPublishing.c"
+#line 6567 "PicasaPublishing.c"
} else {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 6557 "PicasaPublishing.c"
+#line 6571 "PicasaPublishing.c"
}
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6563 "PicasaPublishing.c"
+#line 6577 "PicasaPublishing.c"
}
}
@@ -6597,14 +6611,14 @@ static void publishing_picasa_publishing_options_pane_size_description_class_ini
publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass);
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize;
-#line 6573 "PicasaPublishing.c"
+#line 6587 "PicasaPublishing.c"
}
static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) {
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->ref_count = 1;
-#line 6580 "PicasaPublishing.c"
+#line 6594 "PicasaPublishing.c"
}
@@ -6616,7 +6630,7 @@ static void publishing_picasa_publishing_options_pane_size_description_finalize
g_signal_handlers_destroy (self);
#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_g_free0 (self->name);
-#line 6592 "PicasaPublishing.c"
+#line 6606 "PicasaPublishing.c"
}
@@ -6641,7 +6655,7 @@ static gpointer publishing_picasa_publishing_options_pane_size_description_ref (
g_atomic_int_inc (&self->ref_count);
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return instance;
-#line 6617 "PicasaPublishing.c"
+#line 6631 "PicasaPublishing.c"
}
@@ -6654,7 +6668,7 @@ static void publishing_picasa_publishing_options_pane_size_description_unref (gp
PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self);
#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6630 "PicasaPublishing.c"
+#line 6644 "PicasaPublishing.c"
}
}
@@ -6670,7 +6684,7 @@ static void publishing_picasa_publishing_options_pane_class_init (PublishingPica
g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6646 "PicasaPublishing.c"
+#line 6660 "PicasaPublishing.c"
}
@@ -6685,7 +6699,7 @@ static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pan
iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled;
-#line 6661 "PicasaPublishing.c"
+#line 6675 "PicasaPublishing.c"
}
@@ -6718,7 +6732,7 @@ static void publishing_picasa_publishing_options_pane_instance_init (PublishingP
self->priv->publish_button = NULL;
#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->logout_button = NULL;
-#line 6694 "PicasaPublishing.c"
+#line 6708 "PicasaPublishing.c"
}
@@ -6758,7 +6772,7 @@ static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) {
_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj);
-#line 6734 "PicasaPublishing.c"
+#line 6748 "PicasaPublishing.c"
}
@@ -6817,14 +6831,14 @@ PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_co
self->priv->to_new_album = TRUE;
#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 6793 "PicasaPublishing.c"
+#line 6807 "PicasaPublishing.c"
}
PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) {
#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS);
-#line 6800 "PicasaPublishing.c"
+#line 6814 "PicasaPublishing.c"
}
@@ -6839,7 +6853,7 @@ gboolean publishing_picasa_publishing_parameters_is_to_new_album (PublishingPica
result = _tmp0_;
#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6815 "PicasaPublishing.c"
+#line 6829 "PicasaPublishing.c"
}
@@ -6851,7 +6865,7 @@ void publishing_picasa_publishing_parameters_set_is_to_new_album (PublishingPica
_tmp0_ = to_new_album;
#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->to_new_album = _tmp0_;
-#line 6827 "PicasaPublishing.c"
+#line 6841 "PicasaPublishing.c"
}
@@ -6863,7 +6877,7 @@ void publishing_picasa_publishing_parameters_set_is_new_album_public (Publishing
_tmp0_ = album_public;
#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->album_public = _tmp0_;
-#line 6839 "PicasaPublishing.c"
+#line 6853 "PicasaPublishing.c"
}
@@ -6878,7 +6892,7 @@ gboolean publishing_picasa_publishing_parameters_is_new_album_public (Publishing
result = _tmp0_;
#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6854 "PicasaPublishing.c"
+#line 6868 "PicasaPublishing.c"
}
@@ -6896,7 +6910,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing
result = _tmp1_;
#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6872 "PicasaPublishing.c"
+#line 6886 "PicasaPublishing.c"
}
@@ -6915,7 +6929,7 @@ void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPi
_g_free0 (self->priv->target_album_name);
#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->target_album_name = _tmp1_;
-#line 6891 "PicasaPublishing.c"
+#line 6905 "PicasaPublishing.c"
}
@@ -6934,7 +6948,7 @@ void publishing_picasa_publishing_parameters_set_target_album_entry_url (Publish
_g_free0 (self->priv->target_album_url);
#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->target_album_url = _tmp1_;
-#line 6910 "PicasaPublishing.c"
+#line 6924 "PicasaPublishing.c"
}
@@ -6952,7 +6966,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi
result = _tmp1_;
#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 6928 "PicasaPublishing.c"
+#line 6942 "PicasaPublishing.c"
}
@@ -6965,7 +6979,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 6941 "PicasaPublishing.c"
+#line 6955 "PicasaPublishing.c"
{
GRegex* regex = NULL;
const gchar* _tmp0_ = NULL;
@@ -6996,7 +7010,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 6972 "PicasaPublishing.c"
+#line 6986 "PicasaPublishing.c"
goto __catch15_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7005,7 +7019,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 6981 "PicasaPublishing.c"
+#line 6995 "PicasaPublishing.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
@@ -7021,7 +7035,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 6997 "PicasaPublishing.c"
+#line 7011 "PicasaPublishing.c"
goto __catch15_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7032,7 +7046,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 7008 "PicasaPublishing.c"
+#line 7022 "PicasaPublishing.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
@@ -7046,7 +7060,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 7022 "PicasaPublishing.c"
+#line 7036 "PicasaPublishing.c"
}
goto __finally15;
__catch15_g_regex_error:
@@ -7060,7 +7074,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 7036 "PicasaPublishing.c"
+#line 7050 "PicasaPublishing.c"
}
__finally15:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7071,7 +7085,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 7047 "PicasaPublishing.c"
+#line 7061 "PicasaPublishing.c"
}
}
@@ -7098,7 +7112,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
_g_free0 (entry_url);
#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7074 "PicasaPublishing.c"
+#line 7088 "PicasaPublishing.c"
}
@@ -7116,7 +7130,7 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu
result = _tmp1_;
#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7092 "PicasaPublishing.c"
+#line 7106 "PicasaPublishing.c"
}
@@ -7135,35 +7149,35 @@ void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPubl
_g_free0 (self->priv->user_name);
#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->user_name = _tmp1_;
-#line 7111 "PicasaPublishing.c"
+#line 7125 "PicasaPublishing.c"
}
static gpointer _publishing_picasa_album_ref0 (gpointer self) {
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self ? publishing_picasa_album_ref (self) : NULL;
-#line 7118 "PicasaPublishing.c"
+#line 7132 "PicasaPublishing.c"
}
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
PublishingPicasaAlbum** result;
int i;
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = g_new0 (PublishingPicasaAlbum*, length + 1);
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (i = 0; i < length; i++) {
-#line 7129 "PicasaPublishing.c"
+#line 7143 "PicasaPublishing.c"
PublishingPicasaAlbum* _tmp0_ = NULL;
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result[i] = _tmp0_;
-#line 7135 "PicasaPublishing.c"
+#line 7149 "PicasaPublishing.c"
}
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7139 "PicasaPublishing.c"
+#line 7153 "PicasaPublishing.c"
}
@@ -7182,7 +7196,7 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0__length1 = self->priv->albums_length1;
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+ _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1__length1 = _tmp0__length1;
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -7193,34 +7207,34 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
if (result_length1) {
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*result_length1 = _tmp2__length1;
-#line 7169 "PicasaPublishing.c"
+#line 7183 "PicasaPublishing.c"
}
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = _tmp2_;
#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7175 "PicasaPublishing.c"
+#line 7189 "PicasaPublishing.c"
}
-static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum** _vala_array_dup7 (PublishingPicasaAlbum** self, int length) {
PublishingPicasaAlbum** result;
int i;
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result = g_new0 (PublishingPicasaAlbum*, length + 1);
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
for (i = 0; i < length; i++) {
-#line 7186 "PicasaPublishing.c"
+#line 7200 "PicasaPublishing.c"
PublishingPicasaAlbum* _tmp0_ = NULL;
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
result[i] = _tmp0_;
-#line 7192 "PicasaPublishing.c"
+#line 7206 "PicasaPublishing.c"
}
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7196 "PicasaPublishing.c"
+#line 7210 "PicasaPublishing.c"
}
@@ -7236,7 +7250,7 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp0__length1 = albums_length1;
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
- _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+ _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup7 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
_tmp1__length1 = _tmp0__length1;
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -7247,7 +7261,7 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish
self->priv->albums_length1 = _tmp1__length1;
#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->_albums_size_ = self->priv->albums_length1;
-#line 7223 "PicasaPublishing.c"
+#line 7237 "PicasaPublishing.c"
}
@@ -7259,7 +7273,7 @@ void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (Publish
_tmp0_ = pixels;
#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->major_axis_size_pixels = _tmp0_;
-#line 7235 "PicasaPublishing.c"
+#line 7249 "PicasaPublishing.c"
}
@@ -7274,7 +7288,7 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (Publish
result = _tmp0_;
#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7250 "PicasaPublishing.c"
+#line 7264 "PicasaPublishing.c"
}
@@ -7286,7 +7300,7 @@ void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (P
_tmp0_ = selection_id;
#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->major_axis_size_selection_id = _tmp0_;
-#line 7262 "PicasaPublishing.c"
+#line 7276 "PicasaPublishing.c"
}
@@ -7301,7 +7315,7 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (P
result = _tmp0_;
#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7277 "PicasaPublishing.c"
+#line 7291 "PicasaPublishing.c"
}
@@ -7313,7 +7327,7 @@ void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicas
_tmp0_ = strip_metadata;
#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->strip_metadata = _tmp0_;
-#line 7289 "PicasaPublishing.c"
+#line 7303 "PicasaPublishing.c"
}
@@ -7328,7 +7342,7 @@ gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingP
result = _tmp0_;
#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7304 "PicasaPublishing.c"
+#line 7318 "PicasaPublishing.c"
}
@@ -7340,7 +7354,7 @@ void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPub
_tmp0_ = media_type;
#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->media_type = _tmp0_;
-#line 7316 "PicasaPublishing.c"
+#line 7330 "PicasaPublishing.c"
}
@@ -7355,14 +7369,14 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med
result = _tmp0_;
#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7331 "PicasaPublishing.c"
+#line 7345 "PicasaPublishing.c"
}
static void publishing_picasa_value_publishing_parameters_init (GValue* value) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 7338 "PicasaPublishing.c"
+#line 7352 "PicasaPublishing.c"
}
@@ -7371,7 +7385,7 @@ static void publishing_picasa_value_publishing_parameters_free_value (GValue* va
if (value->data[0].v_pointer) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer);
-#line 7347 "PicasaPublishing.c"
+#line 7361 "PicasaPublishing.c"
}
}
@@ -7381,11 +7395,11 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal
if (src_value->data[0].v_pointer) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 7357 "PicasaPublishing.c"
+#line 7371 "PicasaPublishing.c"
} else {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 7361 "PicasaPublishing.c"
+#line 7375 "PicasaPublishing.c"
}
}
@@ -7393,37 +7407,37 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal
static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 7369 "PicasaPublishing.c"
+#line 7383 "PicasaPublishing.c"
}
static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 7376 "PicasaPublishing.c"
+#line 7390 "PicasaPublishing.c"
PublishingPicasaPublishingParameters* object;
object = collect_values[0].v_pointer;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7383 "PicasaPublishing.c"
+#line 7397 "PicasaPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.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 7387 "PicasaPublishing.c"
+#line 7401 "PicasaPublishing.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object);
-#line 7391 "PicasaPublishing.c"
+#line 7405 "PicasaPublishing.c"
} else {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 7395 "PicasaPublishing.c"
+#line 7409 "PicasaPublishing.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 7399 "PicasaPublishing.c"
+#line 7413 "PicasaPublishing.c"
}
@@ -7434,25 +7448,25 @@ static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const G
if (!object_p) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7410 "PicasaPublishing.c"
+#line 7424 "PicasaPublishing.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (!value->data[0].v_pointer) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = NULL;
-#line 7416 "PicasaPublishing.c"
+#line 7430 "PicasaPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 7420 "PicasaPublishing.c"
+#line 7434 "PicasaPublishing.c"
} else {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
*object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7424 "PicasaPublishing.c"
+#line 7438 "PicasaPublishing.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return NULL;
-#line 7428 "PicasaPublishing.c"
+#line 7442 "PicasaPublishing.c"
}
@@ -7466,7 +7480,7 @@ GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* nam
G_PARAM_SPEC (spec)->value_type = object_type;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 7442 "PicasaPublishing.c"
+#line 7456 "PicasaPublishing.c"
}
@@ -7475,7 +7489,7 @@ gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value)
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return value->data[0].v_pointer;
-#line 7451 "PicasaPublishing.c"
+#line 7465 "PicasaPublishing.c"
}
@@ -7495,17 +7509,17 @@ void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer
value->data[0].v_pointer = v_object;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7471 "PicasaPublishing.c"
+#line 7485 "PicasaPublishing.c"
} else {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 7475 "PicasaPublishing.c"
+#line 7489 "PicasaPublishing.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_unref (old);
-#line 7481 "PicasaPublishing.c"
+#line 7495 "PicasaPublishing.c"
}
}
@@ -7524,17 +7538,17 @@ void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 7500 "PicasaPublishing.c"
+#line 7514 "PicasaPublishing.c"
} else {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 7504 "PicasaPublishing.c"
+#line 7518 "PicasaPublishing.c"
}
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
if (old) {
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
publishing_picasa_publishing_parameters_unref (old);
-#line 7510 "PicasaPublishing.c"
+#line 7524 "PicasaPublishing.c"
}
}
@@ -7546,7 +7560,7 @@ static void publishing_picasa_publishing_parameters_class_init (PublishingPicasa
((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize;
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate));
-#line 7522 "PicasaPublishing.c"
+#line 7536 "PicasaPublishing.c"
}
@@ -7555,7 +7569,7 @@ static void publishing_picasa_publishing_parameters_instance_init (PublishingPic
self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->ref_count = 1;
-#line 7531 "PicasaPublishing.c"
+#line 7545 "PicasaPublishing.c"
}
@@ -7573,7 +7587,7 @@ static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPu
_g_free0 (self->priv->user_name);
#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 7549 "PicasaPublishing.c"
+#line 7563 "PicasaPublishing.c"
}
@@ -7598,7 +7612,7 @@ gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return instance;
-#line 7574 "PicasaPublishing.c"
+#line 7588 "PicasaPublishing.c"
}
@@ -7611,7 +7625,7 @@ void publishing_picasa_publishing_parameters_unref (gpointer instance) {
PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 7587 "PicasaPublishing.c"
+#line 7601 "PicasaPublishing.c"
}
}
@@ -7645,14 +7659,14 @@ PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_typ
self->priv->parameters = _tmp3_;
#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return self;
-#line 7621 "PicasaPublishing.c"
+#line 7635 "PicasaPublishing.c"
}
PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 7628 "PicasaPublishing.c"
+#line 7642 "PicasaPublishing.c"
}
@@ -7692,7 +7706,7 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
result = _tmp6_;
#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
return result;
-#line 7668 "PicasaPublishing.c"
+#line 7682 "PicasaPublishing.c"
}
@@ -7705,14 +7719,14 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass
g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate));
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_picasa_uploader_real_create_transaction;
-#line 7681 "PicasaPublishing.c"
+#line 7695 "PicasaPublishing.c"
}
static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) {
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self);
-#line 7688 "PicasaPublishing.c"
+#line 7702 "PicasaPublishing.c"
}
@@ -7724,7 +7738,7 @@ static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploa
_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj);
-#line 7700 "PicasaPublishing.c"
+#line 7714 "PicasaPublishing.c"
}
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
index 621ae12..facbd1b 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -562,7 +562,7 @@ internal class UploadTransaction :
string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(
publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME)),
summary, keywords_string);
- Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data);
+ var metadata_buffer = new Soup.Buffer.take (metadata.data);
message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer);
// attempt to map the binary image data from disk into memory
@@ -581,7 +581,7 @@ internal class UploadTransaction :
// bind the binary image data read from disk into a Soup.Buffer object so that we
// can attach it to the multipart request, then actaully append the buffer
// to the multipart request. Then, set the MIME type for this part.
- Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, photo_data);
+ var bindable_data = new Soup.Buffer.with_owner (photo_data, this, null);
message_parts.append_form_file("", publishable.get_serialized_file().get_path(), mime_type,
bindable_data);
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index ada0062..87af607 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -16,11 +16,12 @@
#include <gio/gio.h>
#include "shotwell-plugin-common.h"
#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
#include <libsoup/soup.h>
#include <libxml/tree.h>
+#include <gee.h>
#include <float.h>
#include <math.h>
+#include <gtk/gtk.h>
#include <gcr/gcr-base.h>
#include <ui/gcr-ui.h>
#include <gobject/gvaluecollector.h>
@@ -234,7 +235,6 @@ typedef struct _PublishingPiwigoUploaderPrivate PublishingPiwigoUploaderPrivate;
typedef struct _PublishingPiwigoImagesAddTransaction PublishingPiwigoImagesAddTransaction;
typedef struct _PublishingPiwigoImagesAddTransactionClass PublishingPiwigoImagesAddTransactionClass;
typedef struct _PublishingPiwigoSSLErrorPanePrivate PublishingPiwigoSSLErrorPanePrivate;
-typedef struct _Block1Data Block1Data;
#define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
typedef struct _PublishingPiwigoAuthenticationPanePrivate PublishingPiwigoAuthenticationPanePrivate;
typedef struct _PublishingPiwigoPublishingOptionsPanePrivate PublishingPiwigoPublishingOptionsPanePrivate;
@@ -380,56 +380,49 @@ struct _PublishingPiwigoUploaderPrivate {
};
struct _PublishingPiwigoSSLErrorPane {
- GObject parent_instance;
+ ShotwellPluginsCommonBuilderPane parent_instance;
PublishingPiwigoSSLErrorPanePrivate * priv;
};
struct _PublishingPiwigoSSLErrorPaneClass {
- GObjectClass parent_class;
+ ShotwellPluginsCommonBuilderPaneClass parent_class;
};
struct _PublishingPiwigoSSLErrorPanePrivate {
- GtkBuilder* builder;
- GtkWidget* content;
-};
-
-struct _Block1Data {
- int _ref_count_;
- PublishingPiwigoSSLErrorPane* self;
- GTlsCertificate* cert;
+ gchar* _host;
+ GTlsCertificate* _cert;
+ gchar* _error_text;
};
struct _PublishingPiwigoAuthenticationPane {
- GObject parent_instance;
+ ShotwellPluginsCommonBuilderPane parent_instance;
PublishingPiwigoAuthenticationPanePrivate * priv;
};
struct _PublishingPiwigoAuthenticationPaneClass {
- GObjectClass parent_class;
+ ShotwellPluginsCommonBuilderPaneClass parent_class;
};
struct _PublishingPiwigoAuthenticationPanePrivate {
- GtkBox* pane_widget;
- GtkBuilder* builder;
+ PublishingPiwigoAuthenticationPaneMode _mode;
+ PublishingPiwigoPiwigoPublisher* _publisher;
GtkEntry* url_entry;
GtkEntry* username_entry;
GtkEntry* password_entry;
- GtkCheckButton* remember_password_checkbutton;
+ GtkSwitch* remember_password_checkbutton;
GtkButton* login_button;
};
struct _PublishingPiwigoPublishingOptionsPane {
- GObject parent_instance;
+ ShotwellPluginsCommonBuilderPane parent_instance;
PublishingPiwigoPublishingOptionsPanePrivate * priv;
};
struct _PublishingPiwigoPublishingOptionsPaneClass {
- GObjectClass parent_class;
+ ShotwellPluginsCommonBuilderPaneClass parent_class;
};
struct _PublishingPiwigoPublishingOptionsPanePrivate {
- GtkBox* pane_widget;
- GtkBuilder* builder;
GtkRadioButton* use_existing_radio;
GtkRadioButton* create_new_radio;
GtkComboBoxText* existing_categories_combo;
@@ -445,20 +438,20 @@ struct _PublishingPiwigoPublishingOptionsPanePrivate {
GtkButton* publish_button;
GtkTextView* album_comment;
GtkLabel* album_comment_label;
- PublishingPiwigoCategory** existing_categories;
- gint existing_categories_length1;
- gint _existing_categories_size_;
PublishingPiwigoPermissionLevel** perm_levels;
gint perm_levels_length1;
gint _perm_levels_size_;
PublishingPiwigoSizeEntry** photo_sizes;
gint photo_sizes_length1;
gint _photo_sizes_size_;
- gint last_category;
- gint last_permission_level;
- gint last_photo_size;
- gboolean last_title_as_comment;
- gboolean last_no_upload_tags;
+ gint _last_category;
+ gint _last_permission_level;
+ gint _last_photo_size;
+ gboolean _last_title_as_comment;
+ gboolean _last_no_upload_tags;
+ gboolean _strip_metadata_enabled;
+ GeeList* _existing_categories;
+ gchar* _default_comment;
};
struct _PublishingPiwigoSession {
@@ -560,7 +553,6 @@ static gpointer publishing_piwigo_piwigo_publisher_parent_class = NULL;
static SpitPublishingPublisherIface* publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = NULL;
static gpointer publishing_piwigo_uploader_parent_class = NULL;
static gpointer publishing_piwigo_ssl_error_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_parent_iface = NULL;
static gpointer publishing_piwigo_authentication_pane_parent_class = NULL;
static gchar* publishing_piwigo_authentication_pane_INTRO_MESSAGE;
static gchar* publishing_piwigo_authentication_pane_INTRO_MESSAGE = NULL;
@@ -568,11 +560,9 @@ static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = NULL;
static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL;
-static SpitPublishingDialogPaneIface* publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
static gpointer publishing_piwigo_publishing_options_pane_parent_class = NULL;
static gchar* publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
static gchar* publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = NULL;
-static SpitPublishingDialogPaneIface* publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
static gpointer publishing_piwigo_session_parent_class = NULL;
static gpointer publishing_piwigo_transaction_parent_class = NULL;
static gpointer publishing_piwigo_session_login_transaction_parent_class = NULL;
@@ -593,7 +583,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi
static const gchar* piwigo_service_real_get_id (SpitPluggable* base);
static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base);
static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length);
static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled);
static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
@@ -620,6 +610,7 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment);
PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment);
gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self);
+gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other);
static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj);
gpointer publishing_piwigo_permission_level_ref (gpointer instance);
void publishing_piwigo_permission_level_unref (gpointer instance);
@@ -701,7 +692,6 @@ PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (P
PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode);
static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password);
static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self);
-GtkWidget* publishing_piwigo_authentication_pane_get_default_widget (PublishingPiwigoAuthenticationPane* self);
GType publishing_piwigo_transaction_get_type (void) G_GNUC_CONST;
GType publishing_piwigo_session_login_transaction_get_type (void) G_GNUC_CONST;
static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url);
@@ -710,7 +700,6 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPi
PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self);
static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self);
-GtkWidget* publishing_piwigo_ssl_error_pane_get_default_widget (PublishingPiwigoSSLErrorPane* self);
static void _vala_SoupURI_free (SoupURI* self);
gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url);
PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
@@ -757,7 +746,6 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self);
static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata);
static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self);
-GtkWidget* publishing_piwigo_publishing_options_pane_get_default_widget (PublishingPiwigoPublishingOptionsPane* self);
GType publishing_piwigo_session_logout_transaction_get_type (void) G_GNUC_CONST;
PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session);
PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session);
@@ -802,23 +790,34 @@ GType publishing_piwigo_images_add_transaction_get_type (void) G_GNUC_CONST;
static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
#define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPanePrivate))
enum {
- PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY,
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST,
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT,
+ PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT
};
-static Block1Data* block1_data_ref (Block1Data* _data1_);
-static void block1_data_unref (void * _userdata_);
-static void ___lambda4_ (Block1Data* _data1_);
-static void ____lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void ___lambda5_ (PublishingPiwigoSSLErrorPane* self);
-static void ____lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_ssl_error_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static GtkWidget* publishing_piwigo_ssl_error_pane_real_get_widget (SpitPublishingDialogPane* base);
-static void publishing_piwigo_ssl_error_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base);
+gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self);
+gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self);
+static void __lambda4_ (PublishingPiwigoSSLErrorPane* self);
+static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self);
+static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda5_ (PublishingPiwigoSSLErrorPane* self);
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value);
+static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value);
+static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value);
static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj);
+static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
#define PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPanePrivate))
enum {
- PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY,
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE,
+ PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER
};
+static void publishing_piwigo_authentication_pane_real_constructed (GObject* base);
+PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self);
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self);
static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self);
static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self);
@@ -828,16 +827,32 @@ static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_edita
static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self);
static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self);
-static GtkWidget* publishing_piwigo_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_piwigo_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_piwigo_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
+static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value);
+static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value);
static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
static void publishing_piwigo_authentication_pane_finalize (GObject* obj);
+static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
#define PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPanePrivate))
enum {
- PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES,
+ PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT
};
+static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length);
+static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher);
+static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base);
+static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self);
+static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self);
+static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
@@ -850,10 +865,9 @@ static void publishing_piwigo_publishing_options_pane_on_new_category_entry_chan
static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self);
static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length);
static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
-static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPublishingOptionsPane* self, PublishingPiwigoPiwigoPublisher* publisher);
+static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self);
static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
@@ -864,21 +878,32 @@ static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length,
static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self);
static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name);
-static GtkWidget* publishing_piwigo_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self);
static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self);
static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id);
+static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self);
static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id);
+static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self);
static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id);
-static void publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self);
+static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value);
+static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value);
static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj);
+static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
#define PUBLISHING_PIWIGO_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSessionPrivate))
enum {
PUBLISHING_PIWIGO_SESSION_DUMMY_PROPERTY
@@ -934,7 +959,7 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
_tmp0__length1 = piwigo_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp0_ == NULL) {
-#line 938 "PiwigoPublishing.c"
+#line 963 "PiwigoPublishing.c"
gint _tmp1_ = 0;
GdkPixbuf** _tmp2_ = NULL;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -947,18 +972,18 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
piwigo_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_piwigo_service_icon_pixbuf_set_size_ = piwigo_service_icon_pixbuf_set_length1;
-#line 951 "PiwigoPublishing.c"
+#line 976 "PiwigoPublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 955 "PiwigoPublishing.c"
+#line 980 "PiwigoPublishing.c"
}
PiwigoService* piwigo_service_new (GFile* resource_directory) {
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return piwigo_service_construct (TYPE_PIWIGO_SERVICE, resource_directory);
-#line 962 "PiwigoPublishing.c"
+#line 987 "PiwigoPublishing.c"
}
@@ -980,7 +1005,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi
result = _tmp2_;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 984 "PiwigoPublishing.c"
+#line 1009 "PiwigoPublishing.c"
}
@@ -993,7 +1018,7 @@ static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.piwigo";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 997 "PiwigoPublishing.c"
+#line 1022 "PiwigoPublishing.c"
}
@@ -1006,35 +1031,35 @@ static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base)
result = "Piwigo";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1010 "PiwigoPublishing.c"
+#line 1035 "PiwigoPublishing.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 1017 "PiwigoPublishing.c"
+#line 1042 "PiwigoPublishing.c"
}
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length) {
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (i = 0; i < length; i++) {
-#line 1028 "PiwigoPublishing.c"
+#line 1053 "PiwigoPublishing.c"
GdkPixbuf* _tmp0_ = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result[i] = _tmp0_;
-#line 1034 "PiwigoPublishing.c"
+#line 1059 "PiwigoPublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1038 "PiwigoPublishing.c"
+#line 1063 "PiwigoPublishing.c"
}
@@ -1107,7 +1132,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8__length1 = piwigo_service_icon_pixbuf_set_length1;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+ _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup13 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9__length1 = _tmp8__length1;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1116,7 +1141,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
(*info).icons = _tmp9_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*info).icons_length1 = _tmp9__length1;
-#line 1120 "PiwigoPublishing.c"
+#line 1145 "PiwigoPublishing.c"
}
@@ -1124,7 +1149,7 @@ static void piwigo_service_real_activation (SpitPluggable* base, gboolean enable
PiwigoService * self;
#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
-#line 1128 "PiwigoPublishing.c"
+#line 1153 "PiwigoPublishing.c"
}
@@ -1145,7 +1170,7 @@ static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublis
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1149 "PiwigoPublishing.c"
+#line 1174 "PiwigoPublishing.c"
}
@@ -1158,7 +1183,7 @@ static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1162 "PiwigoPublishing.c"
+#line 1187 "PiwigoPublishing.c"
}
@@ -1167,7 +1192,7 @@ static void piwigo_service_class_init (PiwigoServiceClass * klass) {
piwigo_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = piwigo_service_finalize;
-#line 1171 "PiwigoPublishing.c"
+#line 1196 "PiwigoPublishing.c"
}
@@ -1184,7 +1209,7 @@ static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) piwigo_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->activation = (void (*)(SpitPluggable*, gboolean)) piwigo_service_real_activation;
-#line 1188 "PiwigoPublishing.c"
+#line 1213 "PiwigoPublishing.c"
}
@@ -1195,7 +1220,7 @@ static void piwigo_service_spit_publishing_service_interface_init (SpitPublishin
iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) piwigo_service_real_get_supported_media;
-#line 1199 "PiwigoPublishing.c"
+#line 1224 "PiwigoPublishing.c"
}
@@ -1209,7 +1234,7 @@ static void piwigo_service_finalize (GObject* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIWIGO_SERVICE, PiwigoService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (piwigo_service_parent_class)->finalize (obj);
-#line 1213 "PiwigoPublishing.c"
+#line 1238 "PiwigoPublishing.c"
}
@@ -1274,14 +1299,14 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
self->comment = _tmp6_;
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1278 "PiwigoPublishing.c"
+#line 1303 "PiwigoPublishing.c"
}
PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_category_construct (PUBLISHING_PIWIGO_TYPE_CATEGORY, id, name, uppercats, comment);
-#line 1285 "PiwigoPublishing.c"
+#line 1310 "PiwigoPublishing.c"
}
@@ -1325,14 +1350,14 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType obje
self->comment = _tmp5_;
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1329 "PiwigoPublishing.c"
+#line 1354 "PiwigoPublishing.c"
}
PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment) {
#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_category_construct_local (PUBLISHING_PIWIGO_TYPE_CATEGORY, name, parent_id, comment);
-#line 1336 "PiwigoPublishing.c"
+#line 1361 "PiwigoPublishing.c"
}
@@ -1347,14 +1372,40 @@ gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
result = _tmp0_ == PUBLISHING_PIWIGO_CATEGORY_NO_ID;
#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 1351 "PiwigoPublishing.c"
+#line 1376 "PiwigoPublishing.c"
+}
+
+
+gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other) {
+ gboolean result = FALSE;
+ PublishingPiwigoCategory* _tmp0_ = NULL;
+ gint _tmp1_ = 0;
+ PublishingPiwigoCategory* _tmp2_ = NULL;
+ gint _tmp3_ = 0;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (_self_), FALSE);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (other), FALSE);
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = _self_;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = _tmp0_->id;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp2_ = other;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = _tmp2_->id;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp1_ == _tmp3_;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 1402 "PiwigoPublishing.c"
}
static void publishing_piwigo_value_category_init (GValue* value) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1358 "PiwigoPublishing.c"
+#line 1409 "PiwigoPublishing.c"
}
@@ -1363,7 +1414,7 @@ static void publishing_piwigo_value_category_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_unref (value->data[0].v_pointer);
-#line 1367 "PiwigoPublishing.c"
+#line 1418 "PiwigoPublishing.c"
}
}
@@ -1373,11 +1424,11 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
if (src_value->data[0].v_pointer) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_category_ref (src_value->data[0].v_pointer);
-#line 1377 "PiwigoPublishing.c"
+#line 1428 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1381 "PiwigoPublishing.c"
+#line 1432 "PiwigoPublishing.c"
}
}
@@ -1385,37 +1436,37 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
static gpointer publishing_piwigo_value_category_peek_pointer (const GValue* value) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1389 "PiwigoPublishing.c"
+#line 1440 "PiwigoPublishing.c"
}
static gchar* publishing_piwigo_value_category_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1396 "PiwigoPublishing.c"
+#line 1447 "PiwigoPublishing.c"
PublishingPiwigoCategory* object;
object = collect_values[0].v_pointer;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1403 "PiwigoPublishing.c"
+#line 1454 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 1407 "PiwigoPublishing.c"
+#line 1458 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_category_ref (object);
-#line 1411 "PiwigoPublishing.c"
+#line 1462 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1415 "PiwigoPublishing.c"
+#line 1466 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1419 "PiwigoPublishing.c"
+#line 1470 "PiwigoPublishing.c"
}
@@ -1426,25 +1477,25 @@ static gchar* publishing_piwigo_value_category_lcopy_value (const GValue* value,
if (!object_p) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1430 "PiwigoPublishing.c"
+#line 1481 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 1436 "PiwigoPublishing.c"
+#line 1487 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1440 "PiwigoPublishing.c"
+#line 1491 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1444 "PiwigoPublishing.c"
+#line 1495 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1448 "PiwigoPublishing.c"
+#line 1499 "PiwigoPublishing.c"
}
@@ -1458,7 +1509,7 @@ GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gcha
G_PARAM_SPEC (spec)->value_type = object_type;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1462 "PiwigoPublishing.c"
+#line 1513 "PiwigoPublishing.c"
}
@@ -1467,7 +1518,7 @@ gpointer publishing_piwigo_value_get_category (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1471 "PiwigoPublishing.c"
+#line 1522 "PiwigoPublishing.c"
}
@@ -1487,17 +1538,17 @@ void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1491 "PiwigoPublishing.c"
+#line 1542 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1495 "PiwigoPublishing.c"
+#line 1546 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_unref (old);
-#line 1501 "PiwigoPublishing.c"
+#line 1552 "PiwigoPublishing.c"
}
}
@@ -1516,17 +1567,17 @@ void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1520 "PiwigoPublishing.c"
+#line 1571 "PiwigoPublishing.c"
} else {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1524 "PiwigoPublishing.c"
+#line 1575 "PiwigoPublishing.c"
}
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_category_unref (old);
-#line 1530 "PiwigoPublishing.c"
+#line 1581 "PiwigoPublishing.c"
}
}
@@ -1536,14 +1587,14 @@ static void publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass
publishing_piwigo_category_parent_class = g_type_class_peek_parent (klass);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoCategoryClass *) klass)->finalize = publishing_piwigo_category_finalize;
-#line 1540 "PiwigoPublishing.c"
+#line 1591 "PiwigoPublishing.c"
}
static void publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self) {
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 1547 "PiwigoPublishing.c"
+#line 1598 "PiwigoPublishing.c"
}
@@ -1561,7 +1612,7 @@ static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj)
_g_free0 (self->display_name);
#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->uppercats);
-#line 1565 "PiwigoPublishing.c"
+#line 1616 "PiwigoPublishing.c"
}
@@ -1586,7 +1637,7 @@ gpointer publishing_piwigo_category_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 1590 "PiwigoPublishing.c"
+#line 1641 "PiwigoPublishing.c"
}
@@ -1599,7 +1650,7 @@ void publishing_piwigo_category_unref (gpointer instance) {
PUBLISHING_PIWIGO_CATEGORY_GET_CLASS (self)->finalize (self);
#line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1603 "PiwigoPublishing.c"
+#line 1654 "PiwigoPublishing.c"
}
}
@@ -1609,240 +1660,240 @@ PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (G
gint _tmp0_ = 0;
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoPermissionLevel*) g_type_create_instance (object_type);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = id;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->id = _tmp0_;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = name;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->name = _tmp2_;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1631 "PiwigoPublishing.c"
+#line 1682 "PiwigoPublishing.c"
}
PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name) {
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_permission_level_construct (PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, id, name);
-#line 1638 "PiwigoPublishing.c"
+#line 1689 "PiwigoPublishing.c"
}
static void publishing_piwigo_value_permission_level_init (GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1645 "PiwigoPublishing.c"
+#line 1696 "PiwigoPublishing.c"
}
static void publishing_piwigo_value_permission_level_free_value (GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (value->data[0].v_pointer) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_unref (value->data[0].v_pointer);
-#line 1654 "PiwigoPublishing.c"
+#line 1705 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_value_permission_level_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (src_value->data[0].v_pointer) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_permission_level_ref (src_value->data[0].v_pointer);
-#line 1664 "PiwigoPublishing.c"
+#line 1715 "PiwigoPublishing.c"
} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1668 "PiwigoPublishing.c"
+#line 1719 "PiwigoPublishing.c"
}
}
static gpointer publishing_piwigo_value_permission_level_peek_pointer (const GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1676 "PiwigoPublishing.c"
+#line 1727 "PiwigoPublishing.c"
}
static gchar* publishing_piwigo_value_permission_level_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1683 "PiwigoPublishing.c"
+#line 1734 "PiwigoPublishing.c"
PublishingPiwigoPermissionLevel* object;
object = collect_values[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1690 "PiwigoPublishing.c"
+#line 1741 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 1694 "PiwigoPublishing.c"
+#line 1745 "PiwigoPublishing.c"
}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_permission_level_ref (object);
-#line 1698 "PiwigoPublishing.c"
+#line 1749 "PiwigoPublishing.c"
} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1702 "PiwigoPublishing.c"
+#line 1753 "PiwigoPublishing.c"
}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1706 "PiwigoPublishing.c"
+#line 1757 "PiwigoPublishing.c"
}
static gchar* publishing_piwigo_value_permission_level_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingPiwigoPermissionLevel** object_p;
object_p = collect_values[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!object_p) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1717 "PiwigoPublishing.c"
+#line 1768 "PiwigoPublishing.c"
}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 1723 "PiwigoPublishing.c"
+#line 1774 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1727 "PiwigoPublishing.c"
+#line 1778 "PiwigoPublishing.c"
} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1731 "PiwigoPublishing.c"
+#line 1782 "PiwigoPublishing.c"
}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1735 "PiwigoPublishing.c"
+#line 1786 "PiwigoPublishing.c"
}
GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingPiwigoParamSpecPermissionLevel* spec;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1749 "PiwigoPublishing.c"
+#line 1800 "PiwigoPublishing.c"
}
gpointer publishing_piwigo_value_get_permission_level (const GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1758 "PiwigoPublishing.c"
+#line 1809 "PiwigoPublishing.c"
}
void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object) {
PublishingPiwigoPermissionLevel* old;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
old = value->data[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (v_object) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1778 "PiwigoPublishing.c"
+#line 1829 "PiwigoPublishing.c"
} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1782 "PiwigoPublishing.c"
+#line 1833 "PiwigoPublishing.c"
}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_unref (old);
-#line 1788 "PiwigoPublishing.c"
+#line 1839 "PiwigoPublishing.c"
}
}
void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object) {
PublishingPiwigoPermissionLevel* old;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
old = value->data[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (v_object) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1807 "PiwigoPublishing.c"
+#line 1858 "PiwigoPublishing.c"
} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1811 "PiwigoPublishing.c"
+#line 1862 "PiwigoPublishing.c"
}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_unref (old);
-#line 1817 "PiwigoPublishing.c"
+#line 1868 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_permission_level_class_init (PublishingPiwigoPermissionLevelClass * klass) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_permission_level_parent_class = g_type_class_peek_parent (klass);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoPermissionLevelClass *) klass)->finalize = publishing_piwigo_permission_level_finalize;
-#line 1827 "PiwigoPublishing.c"
+#line 1878 "PiwigoPublishing.c"
}
static void publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 1834 "PiwigoPublishing.c"
+#line 1885 "PiwigoPublishing.c"
}
static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel* obj) {
PublishingPiwigoPermissionLevel * self;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, PublishingPiwigoPermissionLevel);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_destroy (self);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
-#line 1846 "PiwigoPublishing.c"
+#line 1897 "PiwigoPublishing.c"
}
@@ -1863,24 +1914,24 @@ GType publishing_piwigo_permission_level_get_type (void) {
gpointer publishing_piwigo_permission_level_ref (gpointer instance) {
PublishingPiwigoPermissionLevel* self;
self = instance;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_atomic_int_inc (&self->ref_count);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 1871 "PiwigoPublishing.c"
+#line 1922 "PiwigoPublishing.c"
}
void publishing_piwigo_permission_level_unref (gpointer instance) {
PublishingPiwigoPermissionLevel* self;
self = instance;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_PIWIGO_PERMISSION_LEVEL_GET_CLASS (self)->finalize (self);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1884 "PiwigoPublishing.c"
+#line 1935 "PiwigoPublishing.c"
}
}
@@ -1890,240 +1941,240 @@ PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_
gint _tmp0_ = 0;
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (name != NULL, NULL);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSizeEntry*) g_type_create_instance (object_type);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = id;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->id = _tmp0_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = name;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->name = _tmp2_;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 1912 "PiwigoPublishing.c"
+#line 1963 "PiwigoPublishing.c"
}
PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name) {
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_size_entry_construct (PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, id, name);
-#line 1919 "PiwigoPublishing.c"
+#line 1970 "PiwigoPublishing.c"
}
static void publishing_piwigo_value_size_entry_init (GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1926 "PiwigoPublishing.c"
+#line 1977 "PiwigoPublishing.c"
}
static void publishing_piwigo_value_size_entry_free_value (GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (value->data[0].v_pointer) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_unref (value->data[0].v_pointer);
-#line 1935 "PiwigoPublishing.c"
+#line 1986 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (src_value->data[0].v_pointer) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_size_entry_ref (src_value->data[0].v_pointer);
-#line 1945 "PiwigoPublishing.c"
+#line 1996 "PiwigoPublishing.c"
} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1949 "PiwigoPublishing.c"
+#line 2000 "PiwigoPublishing.c"
}
}
static gpointer publishing_piwigo_value_size_entry_peek_pointer (const GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 1957 "PiwigoPublishing.c"
+#line 2008 "PiwigoPublishing.c"
}
static gchar* publishing_piwigo_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1964 "PiwigoPublishing.c"
+#line 2015 "PiwigoPublishing.c"
PublishingPiwigoSizeEntry* object;
object = collect_values[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1971 "PiwigoPublishing.c"
+#line 2022 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 1975 "PiwigoPublishing.c"
+#line 2026 "PiwigoPublishing.c"
}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_size_entry_ref (object);
-#line 1979 "PiwigoPublishing.c"
+#line 2030 "PiwigoPublishing.c"
} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1983 "PiwigoPublishing.c"
+#line 2034 "PiwigoPublishing.c"
}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 1987 "PiwigoPublishing.c"
+#line 2038 "PiwigoPublishing.c"
}
static gchar* publishing_piwigo_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingPiwigoSizeEntry** object_p;
object_p = collect_values[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!object_p) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1998 "PiwigoPublishing.c"
+#line 2049 "PiwigoPublishing.c"
}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 2004 "PiwigoPublishing.c"
+#line 2055 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 2008 "PiwigoPublishing.c"
+#line 2059 "PiwigoPublishing.c"
} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2012 "PiwigoPublishing.c"
+#line 2063 "PiwigoPublishing.c"
}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 2016 "PiwigoPublishing.c"
+#line 2067 "PiwigoPublishing.c"
}
GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingPiwigoParamSpecSizeEntry* spec;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 2030 "PiwigoPublishing.c"
+#line 2081 "PiwigoPublishing.c"
}
gpointer publishing_piwigo_value_get_size_entry (const GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 2039 "PiwigoPublishing.c"
+#line 2090 "PiwigoPublishing.c"
}
void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
PublishingPiwigoSizeEntry* old;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
old = value->data[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (v_object) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2059 "PiwigoPublishing.c"
+#line 2110 "PiwigoPublishing.c"
} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2063 "PiwigoPublishing.c"
+#line 2114 "PiwigoPublishing.c"
}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_unref (old);
-#line 2069 "PiwigoPublishing.c"
+#line 2120 "PiwigoPublishing.c"
}
}
void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object) {
PublishingPiwigoSizeEntry* old;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
old = value->data[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (v_object) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 2088 "PiwigoPublishing.c"
+#line 2139 "PiwigoPublishing.c"
} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2092 "PiwigoPublishing.c"
+#line 2143 "PiwigoPublishing.c"
}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_unref (old);
-#line 2098 "PiwigoPublishing.c"
+#line 2149 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryClass * klass) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_size_entry_parent_class = g_type_class_peek_parent (klass);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoSizeEntryClass *) klass)->finalize = publishing_piwigo_size_entry_finalize;
-#line 2108 "PiwigoPublishing.c"
+#line 2159 "PiwigoPublishing.c"
}
static void publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 2115 "PiwigoPublishing.c"
+#line 2166 "PiwigoPublishing.c"
}
static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* obj) {
PublishingPiwigoSizeEntry * self;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, PublishingPiwigoSizeEntry);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_destroy (self);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->name);
-#line 2127 "PiwigoPublishing.c"
+#line 2178 "PiwigoPublishing.c"
}
@@ -2144,264 +2195,264 @@ GType publishing_piwigo_size_entry_get_type (void) {
gpointer publishing_piwigo_size_entry_ref (gpointer instance) {
PublishingPiwigoSizeEntry* self;
self = instance;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_atomic_int_inc (&self->ref_count);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 2152 "PiwigoPublishing.c"
+#line 2203 "PiwigoPublishing.c"
}
void publishing_piwigo_size_entry_unref (gpointer instance) {
PublishingPiwigoSizeEntry* self;
self = instance;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_PIWIGO_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2165 "PiwigoPublishing.c"
+#line 2216 "PiwigoPublishing.c"
}
}
PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type) {
PublishingPiwigoPublishingParameters* self = NULL;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoPublishingParameters*) g_type_create_instance (object_type);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 2176 "PiwigoPublishing.c"
+#line 2227 "PiwigoPublishing.c"
}
PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void) {
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_publishing_parameters_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS);
-#line 2183 "PiwigoPublishing.c"
+#line 2234 "PiwigoPublishing.c"
}
static void publishing_piwigo_value_publishing_parameters_init (GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2190 "PiwigoPublishing.c"
+#line 2241 "PiwigoPublishing.c"
}
static void publishing_piwigo_value_publishing_parameters_free_value (GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (value->data[0].v_pointer) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_unref (value->data[0].v_pointer);
-#line 2199 "PiwigoPublishing.c"
+#line 2250 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (src_value->data[0].v_pointer) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 2209 "PiwigoPublishing.c"
+#line 2260 "PiwigoPublishing.c"
} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2213 "PiwigoPublishing.c"
+#line 2264 "PiwigoPublishing.c"
}
}
static gpointer publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 2221 "PiwigoPublishing.c"
+#line 2272 "PiwigoPublishing.c"
}
static gchar* publishing_piwigo_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 2228 "PiwigoPublishing.c"
+#line 2279 "PiwigoPublishing.c"
PublishingPiwigoPublishingParameters* object;
object = collect_values[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (object->parent_instance.g_class == NULL) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2235 "PiwigoPublishing.c"
+#line 2286 "PiwigoPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 2239 "PiwigoPublishing.c"
+#line 2290 "PiwigoPublishing.c"
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (object);
-#line 2243 "PiwigoPublishing.c"
+#line 2294 "PiwigoPublishing.c"
} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2247 "PiwigoPublishing.c"
+#line 2298 "PiwigoPublishing.c"
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 2251 "PiwigoPublishing.c"
+#line 2302 "PiwigoPublishing.c"
}
static gchar* publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingPiwigoPublishingParameters** object_p;
object_p = collect_values[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!object_p) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2262 "PiwigoPublishing.c"
+#line 2313 "PiwigoPublishing.c"
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!value->data[0].v_pointer) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = NULL;
-#line 2268 "PiwigoPublishing.c"
+#line 2319 "PiwigoPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 2272 "PiwigoPublishing.c"
+#line 2323 "PiwigoPublishing.c"
} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*object_p = publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2276 "PiwigoPublishing.c"
+#line 2327 "PiwigoPublishing.c"
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 2280 "PiwigoPublishing.c"
+#line 2331 "PiwigoPublishing.c"
}
GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingPiwigoParamSpecPublishingParameters* spec;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 2294 "PiwigoPublishing.c"
+#line 2345 "PiwigoPublishing.c"
}
gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return value->data[0].v_pointer;
-#line 2303 "PiwigoPublishing.c"
+#line 2354 "PiwigoPublishing.c"
}
void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object) {
PublishingPiwigoPublishingParameters* old;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
old = value->data[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (v_object) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2323 "PiwigoPublishing.c"
+#line 2374 "PiwigoPublishing.c"
} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2327 "PiwigoPublishing.c"
+#line 2378 "PiwigoPublishing.c"
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_unref (old);
-#line 2333 "PiwigoPublishing.c"
+#line 2384 "PiwigoPublishing.c"
}
}
void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object) {
PublishingPiwigoPublishingParameters* old;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
old = value->data[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (v_object) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 2352 "PiwigoPublishing.c"
+#line 2403 "PiwigoPublishing.c"
} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 2356 "PiwigoPublishing.c"
+#line 2407 "PiwigoPublishing.c"
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (old) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_unref (old);
-#line 2362 "PiwigoPublishing.c"
+#line 2413 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_publishing_parameters_class_init (PublishingPiwigoPublishingParametersClass * klass) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingPiwigoPublishingParametersClass *) klass)->finalize = publishing_piwigo_publishing_parameters_finalize;
-#line 2372 "PiwigoPublishing.c"
+#line 2423 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiwigoPublishingParameters * self) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->category = NULL;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->perm_level = NULL;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->photo_size = NULL;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->title_as_comment = FALSE;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->no_upload_tags = FALSE;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->ref_count = 1;
-#line 2389 "PiwigoPublishing.c"
+#line 2440 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters* obj) {
PublishingPiwigoPublishingParameters * self;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, PublishingPiwigoPublishingParameters);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_destroy (self);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (self->category);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_permission_level_unref0 (self->perm_level);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_size_entry_unref0 (self->photo_size);
-#line 2405 "PiwigoPublishing.c"
+#line 2456 "PiwigoPublishing.c"
}
@@ -2422,24 +2473,24 @@ GType publishing_piwigo_publishing_parameters_get_type (void) {
gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance) {
PublishingPiwigoPublishingParameters* self;
self = instance;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_atomic_int_inc (&self->ref_count);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return instance;
-#line 2430 "PiwigoPublishing.c"
+#line 2481 "PiwigoPublishing.c"
}
void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
PublishingPiwigoPublishingParameters* self;
self = instance;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2443 "PiwigoPublishing.c"
+#line 2494 "PiwigoPublishing.c"
}
}
@@ -2451,46 +2502,46 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (G
SpitPublishingPluginHost* _tmp2_ = NULL;
SpitPublishingPluginHost* _tmp3_ = NULL;
PublishingPiwigoSession* _tmp4_ = NULL;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoPiwigoPublisher*) g_object_new (object_type, NULL);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:133: PiwigoPublisher instantiated.");
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:137: PiwigoPublisher instantiated.");
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = service;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->service);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->service = _tmp1_;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = host;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->host);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->host = _tmp3_;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = publishing_piwigo_session_new ();
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->session = _tmp4_;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 2487 "PiwigoPublishing.c"
+#line 2538 "PiwigoPublishing.c"
}
PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_piwigo_publisher_construct (PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, service, host);
-#line 2494 "PiwigoPublishing.c"
+#line 2545 "PiwigoPublishing.c"
}
@@ -2499,17 +2550,17 @@ static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_servic
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_ = NULL;
SpitPublishingService* _tmp1_ = NULL;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->service;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2513 "PiwigoPublishing.c"
+#line 2564 "PiwigoPublishing.c"
}
@@ -2517,17 +2568,17 @@ SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (Publishin
SpitPublishingPluginHost* result = NULL;
SpitPublishingPluginHost* _tmp0_ = NULL;
SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2531 "PiwigoPublishing.c"
+#line 2582 "PiwigoPublishing.c"
}
@@ -2535,15 +2586,15 @@ static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishi
PublishingPiwigoPiwigoPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->running;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp0_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2547 "PiwigoPublishing.c"
+#line 2598 "PiwigoPublishing.c"
}
@@ -2552,31 +2603,31 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
gboolean _tmp0_ = FALSE;
PublishingPiwigoSession* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp0_) {
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 2564 "PiwigoPublishing.c"
+#line 2615 "PiwigoPublishing.c"
}
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:157: PiwigoPublisher: starting interaction.");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->running = TRUE;
#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:161: PiwigoPublisher: starting interaction.");
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->running = TRUE;
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->session;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp2_) {
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:162: PiwigoPublisher: session is authenticated.");
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:166: PiwigoPublisher: session is authenticated.");
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 2580 "PiwigoPublishing.c"
+#line 2631 "PiwigoPublishing.c"
} else {
gchar* persistent_url = NULL;
gchar* _tmp3_ = NULL;
@@ -2587,92 +2638,92 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
gboolean _tmp6_ = FALSE;
gboolean _tmp7_ = FALSE;
const gchar* _tmp8_ = NULL;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:165: PiwigoPublisher: session is not authenticat" \
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:169: PiwigoPublisher: session is not authenticat" \
"ed.");
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
persistent_url = _tmp3_;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
persistent_username = _tmp4_;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
persistent_password = _tmp5_;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = persistent_url;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp8_ != NULL) {
-#line 2609 "PiwigoPublishing.c"
+#line 2660 "PiwigoPublishing.c"
const gchar* _tmp9_ = NULL;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = persistent_username;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp9_ != NULL;
-#line 2615 "PiwigoPublishing.c"
+#line 2666 "PiwigoPublishing.c"
} else {
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = FALSE;
-#line 2619 "PiwigoPublishing.c"
+#line 2670 "PiwigoPublishing.c"
}
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_) {
-#line 2623 "PiwigoPublishing.c"
+#line 2674 "PiwigoPublishing.c"
const gchar* _tmp10_ = NULL;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = persistent_password;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp10_ != NULL;
-#line 2629 "PiwigoPublishing.c"
+#line 2680 "PiwigoPublishing.c"
} else {
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = FALSE;
-#line 2633 "PiwigoPublishing.c"
+#line 2684 "PiwigoPublishing.c"
}
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp6_) {
-#line 2637 "PiwigoPublishing.c"
+#line 2688 "PiwigoPublishing.c"
const gchar* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
const gchar* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = persistent_url;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = persistent_username;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = persistent_password;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 2652 "PiwigoPublishing.c"
+#line 2703 "PiwigoPublishing.c"
} else {
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 2656 "PiwigoPublishing.c"
+#line 2707 "PiwigoPublishing.c"
}
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_password);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_username);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_url);
-#line 2664 "PiwigoPublishing.c"
+#line 2715 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base) {
PublishingPiwigoPiwigoPublisher * self;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->running = FALSE;
-#line 2675 "PiwigoPublishing.c"
+#line 2726 "PiwigoPublishing.c"
}
@@ -2680,34 +2731,34 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPi
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", NULL);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2693 "PiwigoPublishing.c"
+#line 2744 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url) {
SpitPublishingPluginHost* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (url != NULL);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = url;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 2710 "PiwigoPublishing.c"
+#line 2761 "PiwigoPublishing.c"
}
@@ -2715,34 +2766,34 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiw
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", NULL);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2728 "PiwigoPublishing.c"
+#line 2779 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username) {
SpitPublishingPluginHost* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (username != NULL);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = username;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 2745 "PiwigoPublishing.c"
+#line 2796 "PiwigoPublishing.c"
}
@@ -2750,32 +2801,32 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiw
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", NULL);
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2763 "PiwigoPublishing.c"
+#line 2814 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password) {
SpitPublishingPluginHost* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = password;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", _tmp1_);
-#line 2778 "PiwigoPublishing.c"
+#line 2829 "PiwigoPublishing.c"
}
@@ -2783,32 +2834,32 @@ gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiw
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", FALSE);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2796 "PiwigoPublishing.c"
+#line 2847 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password) {
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = remember_password;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", _tmp1_);
-#line 2811 "PiwigoPublishing.c"
+#line 2862 "PiwigoPublishing.c"
}
@@ -2816,32 +2867,32 @@ gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwig
gint result = 0;
SpitPublishingPluginHost* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", -1);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2829 "PiwigoPublishing.c"
+#line 2880 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category) {
SpitPublishingPluginHost* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = last_category;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", _tmp1_);
-#line 2844 "PiwigoPublishing.c"
+#line 2895 "PiwigoPublishing.c"
}
@@ -2849,32 +2900,32 @@ gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiw
gint result = 0;
SpitPublishingPluginHost* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", -1);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2862 "PiwigoPublishing.c"
+#line 2913 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level) {
SpitPublishingPluginHost* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = last_permission_level;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", _tmp1_);
-#line 2877 "PiwigoPublishing.c"
+#line 2928 "PiwigoPublishing.c"
}
@@ -2882,32 +2933,32 @@ gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiw
gint result = 0;
SpitPublishingPluginHost* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", -1);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2895 "PiwigoPublishing.c"
+#line 2946 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size) {
SpitPublishingPluginHost* _tmp0_ = NULL;
gint _tmp1_ = 0;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = last_photo_size;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", _tmp1_);
-#line 2910 "PiwigoPublishing.c"
+#line 2961 "PiwigoPublishing.c"
}
@@ -2915,32 +2966,32 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (Pu
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", FALSE);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2928 "PiwigoPublishing.c"
+#line 2979 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment) {
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = title_as_comment;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", _tmp1_);
-#line 2943 "PiwigoPublishing.c"
+#line 2994 "PiwigoPublishing.c"
}
@@ -2948,32 +2999,32 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (Publ
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", FALSE);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2961 "PiwigoPublishing.c"
+#line 3012 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags) {
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = no_upload_tags;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", _tmp1_);
-#line 2976 "PiwigoPublishing.c"
+#line 3027 "PiwigoPublishing.c"
}
@@ -2981,32 +3032,32 @@ static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (
gboolean result = FALSE;
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 2994 "PiwigoPublishing.c"
+#line 3045 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
SpitPublishingPluginHost* _tmp0_ = NULL;
gboolean _tmp1_ = FALSE;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = strip_metadata;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 3009 "PiwigoPublishing.c"
+#line 3060 "PiwigoPublishing.c"
}
@@ -3022,9 +3073,9 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
* @param mode the mode for the authentication pane
*/
static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self) {
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked ((PublishingPiwigoPiwigoPublisher*) self, url, user, password, remember_password);
-#line 3027 "PiwigoPublishing.c"
+#line 3078 "PiwigoPublishing.c"
}
@@ -3037,39 +3088,39 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
SpitPublishingPluginHost* _tmp4_ = NULL;
GtkWidget* _tmp5_ = NULL;
GtkWidget* _tmp6_ = NULL;
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:277: ACTION: installing authentication pane");
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:281: ACTION: installing authentication pane");
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = mode;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = publishing_piwigo_authentication_pane_new (self, _tmp1_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
authentication_pane = _tmp2_;
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login, self, 0);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->host;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->host;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = publishing_piwigo_authentication_pane_get_default_widget (authentication_pane);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_tmp6_);
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (authentication_pane);
-#line 3072 "PiwigoPublishing.c"
+#line 3123 "PiwigoPublishing.c"
}
@@ -3085,105 +3136,105 @@ static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self) {
gboolean _tmp5_ = FALSE;
gboolean _tmp6_ = FALSE;
const gchar* _tmp7_ = NULL;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:293: SSL: User wants us to retry with broken cer" \
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:297: SSL: User wants us to retry with broken cer" \
"tificate");
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = publishing_piwigo_session_new ();
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->session = _tmp0_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->session;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_session_set_insecure (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
persistent_url = _tmp2_;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
persistent_username = _tmp3_;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
persistent_password = _tmp4_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = persistent_url;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ != NULL) {
-#line 3116 "PiwigoPublishing.c"
+#line 3167 "PiwigoPublishing.c"
const gchar* _tmp8_ = NULL;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = persistent_username;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp8_ != NULL;
-#line 3122 "PiwigoPublishing.c"
+#line 3173 "PiwigoPublishing.c"
} else {
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = FALSE;
-#line 3126 "PiwigoPublishing.c"
+#line 3177 "PiwigoPublishing.c"
}
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp6_) {
-#line 3130 "PiwigoPublishing.c"
+#line 3181 "PiwigoPublishing.c"
const gchar* _tmp9_ = NULL;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = persistent_password;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _tmp9_ != NULL;
-#line 3136 "PiwigoPublishing.c"
+#line 3187 "PiwigoPublishing.c"
} else {
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = FALSE;
-#line 3140 "PiwigoPublishing.c"
+#line 3191 "PiwigoPublishing.c"
}
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp5_) {
-#line 3144 "PiwigoPublishing.c"
+#line 3195 "PiwigoPublishing.c"
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = persistent_url;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = persistent_username;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = persistent_password;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, _tmp13_);
-#line 3159 "PiwigoPublishing.c"
+#line 3210 "PiwigoPublishing.c"
} else {
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3163 "PiwigoPublishing.c"
+#line 3214 "PiwigoPublishing.c"
}
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_password);
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_username);
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (persistent_url);
-#line 3171 "PiwigoPublishing.c"
+#line 3222 "PiwigoPublishing.c"
}
static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__lambda6_ ((PublishingPiwigoPiwigoPublisher*) self);
-#line 3178 "PiwigoPublishing.c"
+#line 3229 "PiwigoPublishing.c"
}
static void _vala_SoupURI_free (SoupURI* self) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 3185 "PiwigoPublishing.c"
+#line 3236 "PiwigoPublishing.c"
}
@@ -3200,51 +3251,51 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
SpitPublishingPluginHost* _tmp7_ = NULL;
GtkWidget* _tmp8_ = NULL;
GtkWidget* _tmp9_ = NULL;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (trans));
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (url != NULL);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = url;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = soup_uri_new (_tmp0_);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
uri = _tmp1_;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->host;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp2_, FALSE);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = trans;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = soup_uri_get_host (uri);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_piwigo_ssl_error_pane_new (_tmp3_, _tmp4_);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
ssl_pane = _tmp5_;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (ssl_pane, "proceed", (GCallback) ___lambda6__publishing_piwigo_ssl_error_pane_proceed, self, 0);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = self->priv->host;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = self->priv->host;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = publishing_piwigo_ssl_error_pane_get_default_widget (ssl_pane);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = _tmp8_;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_dialog_default_widget (_tmp7_, _tmp9_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_tmp9_);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (ssl_pane);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__vala_SoupURI_free0 (uri);
-#line 3246 "PiwigoPublishing.c"
+#line 3297 "PiwigoPublishing.c"
}
@@ -3265,35 +3316,35 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
const gchar* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (url != NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (username != NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_if_fail (password != NULL);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:325: EVENT: on_authentication_pane_login_clicked");
#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (password != NULL);
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:329: EVENT: on_authentication_pane_login_clicked");
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->running;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3283 "PiwigoPublishing.c"
+#line 3334 "PiwigoPublishing.c"
}
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = url;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = username;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = password;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = remember_password;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 3295 "PiwigoPublishing.c"
+#line 3346 "PiwigoPublishing.c"
}
@@ -3309,16 +3360,16 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
* @param password the password of the Piwigo user used to login
*/
static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_login_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3313 "PiwigoPublishing.c"
+#line 3364 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_login_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3320 "PiwigoPublishing.c"
+#line 3371 "PiwigoPublishing.c"
}
@@ -3337,88 +3388,88 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
PublishingPiwigoSessionLoginTransaction* _tmp11_ = NULL;
PublishingPiwigoSessionLoginTransaction* _tmp12_ = NULL;
GError * _inner_error_ = NULL;
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (url != NULL);
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (username != NULL);
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (password != NULL);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:344: ACTION: logging in");
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:348: ACTION: logging in");
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->host;
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = remember_password;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_remember_password (self, _tmp2_);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = remember_password;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp3_) {
-#line 3365 "PiwigoPublishing.c"
+#line 3416 "PiwigoPublishing.c"
const gchar* _tmp4_ = NULL;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = password;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_persistent_password (self, _tmp4_);
-#line 3371 "PiwigoPublishing.c"
+#line 3422 "PiwigoPublishing.c"
} else {
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_persistent_password (self, NULL);
-#line 3375 "PiwigoPublishing.c"
+#line 3426 "PiwigoPublishing.c"
}
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = self->priv->session;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = url;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = publishing_piwigo_piwigo_publisher_normalise_url (_tmp6_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _tmp7_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = username;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = password;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = publishing_piwigo_session_login_transaction_new (_tmp5_, _tmp8_, _tmp9_, _tmp10_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = _tmp11_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp8_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
login_trans = _tmp12_;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3401 "PiwigoPublishing.c"
+#line 3452 "PiwigoPublishing.c"
{
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3409 "PiwigoPublishing.c"
+#line 3460 "PiwigoPublishing.c"
goto __catch32_spit_publishing_publishing_error;
}
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (login_trans);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3420 "PiwigoPublishing.c"
+#line 3471 "PiwigoPublishing.c"
}
}
goto __finally32;
@@ -3426,53 +3477,53 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
{
GError* err = NULL;
GError* _tmp13_ = NULL;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = err;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp13_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 3436 "PiwigoPublishing.c"
+#line 3487 "PiwigoPublishing.c"
const gchar* _tmp14_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:363: ERROR: SSL connection problems");
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:367: ERROR: SSL connection problems");
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = url;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, _tmp14_);
-#line 3444 "PiwigoPublishing.c"
+#line 3495 "PiwigoPublishing.c"
} else {
GError* _tmp15_ = NULL;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:366: ERROR: do_network_login");
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:370: ERROR: do_network_login");
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = err;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp15_);
-#line 3453 "PiwigoPublishing.c"
+#line 3504 "PiwigoPublishing.c"
}
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 3457 "PiwigoPublishing.c"
+#line 3508 "PiwigoPublishing.c"
}
__finally32:
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (login_trans);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3470 "PiwigoPublishing.c"
+#line 3521 "PiwigoPublishing.c"
}
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (login_trans);
-#line 3474 "PiwigoPublishing.c"
+#line 3525 "PiwigoPublishing.c"
}
@@ -3486,95 +3537,95 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
gboolean _tmp10_ = FALSE;
const gchar* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = url;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
norm_url = _tmp1_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = norm_url;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = g_str_has_suffix (_tmp2_, ".php");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp3_) {
-#line 3502 "PiwigoPublishing.c"
+#line 3553 "PiwigoPublishing.c"
const gchar* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
const gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = norm_url;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = g_str_has_suffix (_tmp4_, "/");
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp5_) {
-#line 3513 "PiwigoPublishing.c"
+#line 3564 "PiwigoPublishing.c"
const gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = norm_url;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = g_strconcat (_tmp6_, "/", NULL);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (norm_url);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
norm_url = _tmp7_;
-#line 3524 "PiwigoPublishing.c"
+#line 3575 "PiwigoPublishing.c"
}
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = norm_url;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = g_strconcat (_tmp8_, PUBLISHING_PIWIGO_PIWIGO_WS, NULL);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (norm_url);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
norm_url = _tmp9_;
-#line 3534 "PiwigoPublishing.c"
+#line 3585 "PiwigoPublishing.c"
}
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = norm_url;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = g_str_has_prefix (_tmp11_, "http://");
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp12_) {
-#line 3542 "PiwigoPublishing.c"
+#line 3593 "PiwigoPublishing.c"
const gchar* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = norm_url;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = g_str_has_prefix (_tmp13_, "https://");
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = !_tmp14_;
-#line 3551 "PiwigoPublishing.c"
+#line 3602 "PiwigoPublishing.c"
} else {
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = FALSE;
-#line 3555 "PiwigoPublishing.c"
+#line 3606 "PiwigoPublishing.c"
}
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp10_) {
-#line 3559 "PiwigoPublishing.c"
+#line 3610 "PiwigoPublishing.c"
const gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = norm_url;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = g_strconcat ("http://", _tmp15_, NULL);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (norm_url);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
norm_url = _tmp16_;
-#line 3570 "PiwigoPublishing.c"
+#line 3621 "PiwigoPublishing.c"
}
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = norm_url;
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3576 "PiwigoPublishing.c"
+#line 3627 "PiwigoPublishing.c"
}
@@ -3594,18 +3645,18 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
gchar* result;
result = publishing_piwigo_transaction_validate_xml (doc);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3598 "PiwigoPublishing.c"
+#line 3649 "PiwigoPublishing.c"
}
static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
gchar* result;
result = publishing_piwigo_transaction_get_error_code (doc);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 3607 "PiwigoPublishing.c"
+#line 3658 "PiwigoPublishing.c"
}
@@ -3627,106 +3678,106 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
const gchar* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
GError * _inner_error_ = NULL;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:403: EVENT: on_login_network_complete");
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:407: EVENT: on_login_network_complete");
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = txn;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = txn;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 3647 "PiwigoPublishing.c"
+#line 3698 "PiwigoPublishing.c"
{
PublishingRESTSupportTransaction* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = txn;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _tmp7_;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_tmp8_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp6_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3672 "PiwigoPublishing.c"
+#line 3723 "PiwigoPublishing.c"
goto __catch33_spit_publishing_publishing_error;
}
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3681 "PiwigoPublishing.c"
+#line 3732 "PiwigoPublishing.c"
}
}
goto __finally33;
__catch33_spit_publishing_publishing_error:
{
GError* err = NULL;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 3692 "PiwigoPublishing.c"
+#line 3743 "PiwigoPublishing.c"
{
PublishingRESTSupportTransaction* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
PublishingRESTSupportXmlDocument* _tmp13_ = NULL;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = txn;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = publishing_rest_support_transaction_get_response (_tmp9_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = _tmp10_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = publishing_rest_support_xml_document_parse_string (_tmp11_, _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = _tmp12_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (_tmp13_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp11_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3717 "PiwigoPublishing.c"
+#line 3768 "PiwigoPublishing.c"
goto __catch34_spit_publishing_publishing_error;
}
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3728 "PiwigoPublishing.c"
+#line 3779 "PiwigoPublishing.c"
}
}
goto __finally34;
@@ -3738,110 +3789,110 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
const gchar* _tmp15_ = NULL;
gint _tmp16_ = 0;
gint _tmp17_ = 0;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
code = _inner_error_;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _inner_error_ = NULL;
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _inner_error_ = NULL;
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = code;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = _tmp14_->message;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = atoi (_tmp15_);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
code_int = _tmp16_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = code_int;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp17_ == 999) {
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:418: ERROR: on_login_network_complete, code 999");
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:422: ERROR: on_login_network_complete, code 999");
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 3760 "PiwigoPublishing.c"
+#line 3811 "PiwigoPublishing.c"
} else {
GError* _tmp18_ = NULL;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:421: ERROR: on_login_network_complete");
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:425: ERROR: on_login_network_complete");
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = err;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp18_);
-#line 3769 "PiwigoPublishing.c"
+#line 3820 "PiwigoPublishing.c"
}
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (code);
-#line 3773 "PiwigoPublishing.c"
+#line 3824 "PiwigoPublishing.c"
}
__finally34:
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3788 "PiwigoPublishing.c"
+#line 3839 "PiwigoPublishing.c"
}
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3794 "PiwigoPublishing.c"
+#line 3845 "PiwigoPublishing.c"
}
__finally33:
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3805 "PiwigoPublishing.c"
+#line 3856 "PiwigoPublishing.c"
}
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = txn;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = publishing_rest_support_transaction_get_endpoint_url (_tmp19_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
endpoint_url = _tmp20_;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = endpoint_url;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:429: Setting endpoint URL to %s", _tmp21_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:433: Setting endpoint URL to %s", _tmp21_);
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp22_ = txn;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (self, _tmp22_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pwg_id = _tmp23_;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp24_ = pwg_id;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:431: Setting session pwg_id to %s", _tmp24_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:435: Setting session pwg_id to %s", _tmp24_);
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp25_ = self->priv->session;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp26_ = pwg_id;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_set_pwg_id (_tmp25_, _tmp26_);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp27_ = endpoint_url;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp28_ = pwg_id;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp27_, _tmp28_);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 3843 "PiwigoPublishing.c"
+#line 3894 "PiwigoPublishing.c"
}
@@ -3863,37 +3914,37 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
guint _tmp3_ = 0U;
PublishingPiwigoSession* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:452: EVENT: on_login_network_error");
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:456: EVENT: on_login_network_error");
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = bad_txn;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = bad_txn;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->session;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp5_) {
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3891 "PiwigoPublishing.c"
+#line 3942 "PiwigoPublishing.c"
}
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 3895 "PiwigoPublishing.c"
+#line 3946 "PiwigoPublishing.c"
}
@@ -3908,16 +3959,16 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
* identity.
*/
static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_session_get_status_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3912 "PiwigoPublishing.c"
+#line 3963 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_session_get_status_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3919 "PiwigoPublishing.c"
+#line 3970 "PiwigoPublishing.c"
}
@@ -3927,29 +3978,29 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
PublishingPiwigoSession* _tmp2_ = NULL;
gboolean _tmp3_ = FALSE;
GError * _inner_error_ = NULL;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (url != NULL);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (pwg_id != NULL);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:473: ACTION: fetching session status");
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:477: ACTION: fetching session status");
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->host;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->session;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp3_) {
-#line 3951 "PiwigoPublishing.c"
+#line 4002 "PiwigoPublishing.c"
PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
PublishingPiwigoSession* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
@@ -3957,47 +4008,47 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
PublishingPiwigoSessionGetStatusTransaction* _tmp7_ = NULL;
PublishingPiwigoSessionGetStatusTransaction* _tmp8_ = NULL;
PublishingPiwigoSessionGetStatusTransaction* _tmp9_ = NULL;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->session;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = url;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = pwg_id;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = publishing_piwigo_session_get_status_transaction_new_unauthenticated (_tmp4_, _tmp5_, _tmp6_);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
status_txn = _tmp7_;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = status_txn;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = status_txn;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3977 "PiwigoPublishing.c"
+#line 4028 "PiwigoPublishing.c"
{
PublishingPiwigoSessionGetStatusTransaction* _tmp10_ = NULL;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = status_txn;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3988 "PiwigoPublishing.c"
+#line 4039 "PiwigoPublishing.c"
goto __catch35_spit_publishing_publishing_error;
}
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 3999 "PiwigoPublishing.c"
+#line 4050 "PiwigoPublishing.c"
}
}
goto __finally35;
@@ -4005,80 +4056,80 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
{
GError* err = NULL;
GError* _tmp11_ = NULL;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:485: ERROR: do_fetch_session_status, not authent" \
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:489: ERROR: do_fetch_session_status, not authent" \
"icated");
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = err;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp11_);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 4019 "PiwigoPublishing.c"
+#line 4070 "PiwigoPublishing.c"
}
__finally35:
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4032 "PiwigoPublishing.c"
+#line 4083 "PiwigoPublishing.c"
}
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4036 "PiwigoPublishing.c"
+#line 4087 "PiwigoPublishing.c"
} else {
PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
PublishingPiwigoSession* _tmp12_ = NULL;
PublishingPiwigoSessionGetStatusTransaction* _tmp13_ = NULL;
PublishingPiwigoSessionGetStatusTransaction* _tmp14_ = NULL;
PublishingPiwigoSessionGetStatusTransaction* _tmp15_ = NULL;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = self->priv->session;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = publishing_piwigo_session_get_status_transaction_new (_tmp12_);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
status_txn = _tmp13_;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = status_txn;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = status_txn;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4057 "PiwigoPublishing.c"
+#line 4108 "PiwigoPublishing.c"
{
PublishingPiwigoSessionGetStatusTransaction* _tmp16_ = NULL;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = status_txn;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4068 "PiwigoPublishing.c"
+#line 4119 "PiwigoPublishing.c"
goto __catch36_spit_publishing_publishing_error;
}
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4079 "PiwigoPublishing.c"
+#line 4130 "PiwigoPublishing.c"
}
}
goto __finally36;
@@ -4086,37 +4137,37 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
{
GError* err = NULL;
GError* _tmp17_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:496: ERROR: do_fetch_session_status, authenticat" \
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:500: ERROR: do_fetch_session_status, authenticat" \
"ed");
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = err;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp17_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 4099 "PiwigoPublishing.c"
+#line 4150 "PiwigoPublishing.c"
}
__finally36:
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4112 "PiwigoPublishing.c"
+#line 4163 "PiwigoPublishing.c"
}
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4116 "PiwigoPublishing.c"
+#line 4167 "PiwigoPublishing.c"
}
}
@@ -4136,31 +4187,31 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
PublishingPiwigoSession* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
GError * _inner_error_ = NULL;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:510: EVENT: on_session_get_status_complete");
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:514: EVENT: on_session_get_status_complete");
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = txn;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = txn;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->session;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp5_) {
-#line 4160 "PiwigoPublishing.c"
+#line 4211 "PiwigoPublishing.c"
gchar* endpoint_url = NULL;
PublishingRESTSupportTransaction* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
@@ -4168,23 +4219,23 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
PublishingPiwigoSession* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = txn;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = publishing_rest_support_transaction_get_endpoint_url (_tmp6_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
endpoint_url = _tmp7_;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = self->priv->session;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = publishing_piwigo_session_get_pwg_id (_tmp8_);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pwg_id = _tmp9_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = pwg_id;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:517: Fetching session status for pwg_id %s", _tmp10_);
-#line 4184 "PiwigoPublishing.c"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp10_);
+#line 4235 "PiwigoPublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
PublishingRESTSupportTransaction* _tmp11_ = NULL;
@@ -4196,46 +4247,46 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
PublishingRESTSupportXmlDocument* _tmp16_ = NULL;
xmlNode* _tmp17_ = NULL;
xmlNode* username_node = NULL;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = txn;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = publishing_rest_support_transaction_get_response (_tmp11_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = _tmp12_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = publishing_rest_support_xml_document_parse_string (_tmp13_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = _tmp14_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp13_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
doc = _tmp15_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4214 "PiwigoPublishing.c"
+#line 4265 "PiwigoPublishing.c"
goto __catch37_spit_publishing_publishing_error;
}
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4227 "PiwigoPublishing.c"
+#line 4278 "PiwigoPublishing.c"
}
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = doc;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = publishing_rest_support_xml_document_get_root_node (_tmp16_);
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
root = _tmp17_;
-#line 4235 "PiwigoPublishing.c"
+#line 4286 "PiwigoPublishing.c"
{
xmlNode* _tmp18_ = NULL;
PublishingRESTSupportXmlDocument* _tmp19_ = NULL;
@@ -4255,189 +4306,189 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
PublishingPiwigoSession* _tmp32_ = NULL;
gchar* _tmp33_ = NULL;
gchar* _tmp34_ = NULL;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = doc;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = root;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = publishing_rest_support_xml_document_get_named_child (_tmp19_, _tmp20_, "username", &_inner_error_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = _tmp21_;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4267 "PiwigoPublishing.c"
+#line 4318 "PiwigoPublishing.c"
goto __catch38_spit_publishing_publishing_error;
}
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4282 "PiwigoPublishing.c"
+#line 4333 "PiwigoPublishing.c"
}
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
username_node = _tmp18_;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp22_ = username_node;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = (gchar*) xmlNodeGetContent (_tmp22_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
username = _tmp23_;
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp24_ = username;
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:528: Returned username is %s", _tmp24_);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:532: Returned username is %s", _tmp24_);
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp25_ = self->priv->session;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp26_ = endpoint_url;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp27_ = username;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp28_ = pwg_id;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_authenticate (_tmp25_, _tmp26_, _tmp27_, _tmp28_);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp29_ = self->priv->session;
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp30_ = publishing_piwigo_session_get_pwg_url (_tmp29_);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp31_ = _tmp30_;
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_persistent_url (self, _tmp31_);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp31_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp32_ = self->priv->session;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp33_ = publishing_piwigo_session_get_username (_tmp32_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp34_ = _tmp33_;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_persistent_username (self, _tmp34_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp34_);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (username);
-#line 4330 "PiwigoPublishing.c"
+#line 4381 "PiwigoPublishing.c"
}
goto __finally38;
__catch38_spit_publishing_publishing_error:
{
GError* err2 = NULL;
GError* _tmp35_ = NULL;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err2 = _inner_error_;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:534: ERROR: on_session_get_status_complete, inne" \
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:538: ERROR: on_session_get_status_complete, inne" \
"r");
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp35_ = err2;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp35_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err2);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4357 "PiwigoPublishing.c"
+#line 4408 "PiwigoPublishing.c"
}
__finally38:
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4366 "PiwigoPublishing.c"
+#line 4417 "PiwigoPublishing.c"
goto __catch37_spit_publishing_publishing_error;
}
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4381 "PiwigoPublishing.c"
+#line 4432 "PiwigoPublishing.c"
}
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4385 "PiwigoPublishing.c"
+#line 4436 "PiwigoPublishing.c"
}
goto __finally37;
__catch37_spit_publishing_publishing_error:
{
GError* err = NULL;
GError* _tmp36_ = NULL;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:539: ERROR: on_session_get_status_complete, oute" \
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:543: ERROR: on_session_get_status_complete, oute" \
"r");
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp36_ = err;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp36_);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4410 "PiwigoPublishing.c"
+#line 4461 "PiwigoPublishing.c"
}
__finally37:
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4425 "PiwigoPublishing.c"
+#line 4476 "PiwigoPublishing.c"
}
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (endpoint_url);
-#line 4431 "PiwigoPublishing.c"
+#line 4482 "PiwigoPublishing.c"
} else {
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 4435 "PiwigoPublishing.c"
+#line 4486 "PiwigoPublishing.c"
}
}
@@ -4452,31 +4503,31 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
guint _tmp3_ = 0U;
PublishingRESTSupportTransaction* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:558: EVENT: on_session_get_status_error");
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:562: EVENT: on_session_get_status_error");
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = bad_txn;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = bad_txn;
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = bad_txn;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = err;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4474 "PiwigoPublishing.c"
+#line 4525 "PiwigoPublishing.c"
}
@@ -4487,16 +4538,16 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
* to populate the publishing pane presented to the user.
*/
static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_fetch_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 4487 "PiwigoPublishing.c"
+#line 4538 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_fetch_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 4494 "PiwigoPublishing.c"
+#line 4545 "PiwigoPublishing.c"
}
@@ -4507,48 +4558,48 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
PublishingPiwigoSession* _tmp2_ = NULL;
PublishingPiwigoCategoriesGetListTransaction* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:571: ACTION: fetching categories");
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:575: ACTION: fetching categories");
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->host;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->session;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_categories_get_list_transaction_new (_tmp2_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
cat_trans = _tmp3_;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4527 "PiwigoPublishing.c"
+#line 4578 "PiwigoPublishing.c"
{
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4535 "PiwigoPublishing.c"
+#line 4586 "PiwigoPublishing.c"
goto __catch39_spit_publishing_publishing_error;
}
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4546 "PiwigoPublishing.c"
+#line 4597 "PiwigoPublishing.c"
}
}
goto __finally39;
@@ -4556,36 +4607,36 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
{
GError* err = NULL;
GError* _tmp4_ = NULL;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _inner_error_ = NULL;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:582: ERROR: do_fetch_categories");
#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _inner_error_ = NULL;
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:586: ERROR: do_fetch_categories");
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = err;
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 4566 "PiwigoPublishing.c"
+#line 4617 "PiwigoPublishing.c"
}
__finally39:
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4579 "PiwigoPublishing.c"
+#line 4630 "PiwigoPublishing.c"
}
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 4583 "PiwigoPublishing.c"
+#line 4634 "PiwigoPublishing.c"
}
@@ -4597,19 +4648,19 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
* publishing options pane.
*/
static void _vala_array_add34 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoCategory*, *array, (*size) + 1);
-#line 4601 "PiwigoPublishing.c"
+#line 4652 "PiwigoPublishing.c"
}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 4607 "PiwigoPublishing.c"
+#line 4658 "PiwigoPublishing.c"
}
@@ -4624,49 +4675,49 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
PublishingPiwigoCategory** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
GError * _inner_error_ = NULL;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:595: EVENT: on_category_fetch_complete");
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:599: EVENT: on_category_fetch_complete");
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = txn;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = txn;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = txn;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:598: PiwigoConnector: list of categories: %s", _tmp6_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:602: PiwigoConnector: list of categories: %s", _tmp6_);
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp6_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = self->priv->categories;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7__length1 = self->priv->categories_length1;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ != NULL) {
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories = NULL;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories_length1 = 0;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4664 "PiwigoPublishing.c"
+#line 4715 "PiwigoPublishing.c"
}
{
PublishingRESTSupportXmlDocument* doc = NULL;
@@ -4692,578 +4743,525 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
gchar* _tmp20_ = NULL;
gchar* uppercats = NULL;
gchar* _tmp21_ = NULL;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ GeeHashMap* id_map = NULL;
+ GeeHashMap* _tmp22_ = NULL;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = txn;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = _tmp9_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = publishing_rest_support_xml_document_parse_string (_tmp10_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = _tmp11_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp10_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
doc = _tmp12_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4708 "PiwigoPublishing.c"
+#line 4761 "PiwigoPublishing.c"
goto __catch40_spit_publishing_publishing_error;
}
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4717 "PiwigoPublishing.c"
+#line 4770 "PiwigoPublishing.c"
}
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = doc;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = publishing_rest_support_xml_document_get_root_node (_tmp13_);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
root = _tmp14_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = root;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = xmlFirstElementChild (_tmp15_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
categories_node = _tmp16_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = categories_node;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = _tmp17_->children;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
category_node_iter = _tmp18_;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = g_strdup ("");
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
name = _tmp19_;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = g_strdup ("");
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
id_string = _tmp20_;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = g_strdup ("");
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
uppercats = _tmp21_;
-#line 4749 "PiwigoPublishing.c"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp22_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ id_map = _tmp22_;
+#line 4806 "PiwigoPublishing.c"
{
- gboolean _tmp22_ = FALSE;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = TRUE;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gboolean _tmp23_ = FALSE;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp23_ = TRUE;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 4756 "PiwigoPublishing.c"
- xmlNode* _tmp25_ = NULL;
+#line 4813 "PiwigoPublishing.c"
xmlNode* _tmp26_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp27_ = NULL;
- xmlNode* _tmp28_ = NULL;
+ xmlNode* _tmp27_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp28_ = NULL;
xmlNode* _tmp29_ = NULL;
xmlNode* _tmp30_ = NULL;
- gchar* _tmp31_ = NULL;
- xmlNode* _tmp32_ = NULL;
- PublishingRESTSupportXmlDocument* _tmp33_ = NULL;
- xmlNode* _tmp34_ = NULL;
+ xmlNode* _tmp31_ = NULL;
+ gchar* _tmp32_ = NULL;
+ xmlNode* _tmp33_ = NULL;
+ PublishingRESTSupportXmlDocument* _tmp34_ = NULL;
xmlNode* _tmp35_ = NULL;
xmlNode* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
- xmlNode* _tmp38_ = NULL;
- gchar* _tmp39_ = NULL;
- PublishingPiwigoCategory** _tmp40_ = NULL;
- gint _tmp40__length1 = 0;
- PublishingPiwigoCategory** _tmp42_ = NULL;
- gint _tmp42__length1 = 0;
+ xmlNode* _tmp37_ = NULL;
+ gchar* _tmp38_ = NULL;
+ xmlNode* _tmp39_ = NULL;
+ gchar* _tmp40_ = NULL;
+ GeeHashMap* _tmp41_ = NULL;
+ const gchar* _tmp42_ = NULL;
const gchar* _tmp43_ = NULL;
- gint _tmp44_ = 0;
- const gchar* _tmp45_ = NULL;
- const gchar* _tmp46_ = NULL;
- PublishingPiwigoCategory* _tmp47_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp22_) {
-#line 4783 "PiwigoPublishing.c"
- xmlNode* _tmp23_ = NULL;
+ PublishingPiwigoCategory** _tmp44_ = NULL;
+ gint _tmp44__length1 = 0;
+ PublishingPiwigoCategory** _tmp46_ = NULL;
+ gint _tmp46__length1 = 0;
+ const gchar* _tmp47_ = NULL;
+ gint _tmp48_ = 0;
+ const gchar* _tmp49_ = NULL;
+ const gchar* _tmp50_ = NULL;
+ PublishingPiwigoCategory* _tmp51_ = NULL;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!_tmp23_) {
+#line 4843 "PiwigoPublishing.c"
xmlNode* _tmp24_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = category_node_iter;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = _tmp23_->next;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- category_node_iter = _tmp24_;
-#line 4792 "PiwigoPublishing.c"
+ xmlNode* _tmp25_ = NULL;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp24_ = category_node_iter;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp25_ = _tmp24_->next;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ category_node_iter = _tmp25_;
+#line 4852 "PiwigoPublishing.c"
}
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = FALSE;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = category_node_iter;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp25_ != NULL)) {
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp23_ = FALSE;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp26_ = category_node_iter;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!(_tmp26_ != NULL)) {
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 4802 "PiwigoPublishing.c"
+#line 4862 "PiwigoPublishing.c"
}
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = doc;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = category_node_iter;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = publishing_rest_support_xml_document_get_named_child (_tmp27_, _tmp28_, "name", &_inner_error_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = _tmp29_;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp28_ = doc;
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp29_ = category_node_iter;
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp30_ = publishing_rest_support_xml_document_get_named_child (_tmp28_, _tmp29_, "name", &_inner_error_);
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp27_ = _tmp30_;
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (id_map);
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uppercats);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4824 "PiwigoPublishing.c"
+#line 4886 "PiwigoPublishing.c"
goto __catch40_spit_publishing_publishing_error;
}
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (id_map);
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uppercats);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4841 "PiwigoPublishing.c"
+#line 4905 "PiwigoPublishing.c"
}
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- name_node = _tmp26_;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = name_node;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = (gchar*) xmlNodeGetContent (_tmp30_);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ name_node = _tmp27_;
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp31_ = name_node;
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp32_ = (gchar*) xmlNodeGetContent (_tmp31_);
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- name = _tmp31_;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = doc;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = category_node_iter;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = publishing_rest_support_xml_document_get_named_child (_tmp33_, _tmp34_, "uppercats", &_inner_error_);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = _tmp35_;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ name = _tmp32_;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp34_ = doc;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp35_ = category_node_iter;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "uppercats", &_inner_error_);
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp33_ = _tmp36_;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (id_map);
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uppercats);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4873 "PiwigoPublishing.c"
+#line 4939 "PiwigoPublishing.c"
goto __catch40_spit_publishing_publishing_error;
}
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (id_map);
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uppercats);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 4890 "PiwigoPublishing.c"
+#line 4958 "PiwigoPublishing.c"
}
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uppercats_node = _tmp32_;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = uppercats_node;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp37_ = (gchar*) xmlNodeGetContent (_tmp36_);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ uppercats_node = _tmp33_;
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp37_ = uppercats_node;
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp38_ = (gchar*) xmlNodeGetContent (_tmp37_);
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uppercats);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- uppercats = (gchar*) _tmp37_;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_ = category_node_iter;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp39_ = (gchar*) xmlGetProp (_tmp38_, (xmlChar*) "id");
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ uppercats = (gchar*) _tmp38_;
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp39_ = category_node_iter;
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp40_ = (gchar*) xmlGetProp (_tmp39_, (xmlChar*) "id");
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- id_string = _tmp39_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp40_ = self->priv->categories;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp40__length1 = self->priv->categories_length1;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp40_ == NULL) {
-#line 4916 "PiwigoPublishing.c"
- PublishingPiwigoCategory** _tmp41_ = NULL;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ id_string = _tmp40_;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp41_ = id_map;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp42_ = id_string;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp43_ = name;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp42_, _tmp43_);
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp44_ = self->priv->categories;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp44__length1 = self->priv->categories_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (_tmp44_ == NULL) {
+#line 4992 "PiwigoPublishing.c"
+ PublishingPiwigoCategory** _tmp45_ = NULL;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp45_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->categories = _tmp41_;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->categories = _tmp45_;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories_length1 = 0;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4928 "PiwigoPublishing.c"
+#line 5004 "PiwigoPublishing.c"
}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42_ = self->priv->categories;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42__length1 = self->priv->categories_length1;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp43_ = id_string;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = atoi (_tmp43_);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = name;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = uppercats;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = publishing_piwigo_category_new (_tmp44_, _tmp45_, _tmp46_, "");
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _vala_array_add34 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp47_);
-#line 4946 "PiwigoPublishing.c"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp46_ = self->priv->categories;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp46__length1 = self->priv->categories_length1;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp47_ = id_string;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp48_ = atoi (_tmp47_);
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp49_ = name;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp50_ = uppercats;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp51_ = publishing_piwigo_category_new (_tmp48_, _tmp49_, _tmp50_, "");
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _vala_array_add34 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
+#line 5022 "PiwigoPublishing.c"
}
}
{
gint i = 0;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 4953 "PiwigoPublishing.c"
+#line 5029 "PiwigoPublishing.c"
{
- gboolean _tmp48_ = FALSE;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = TRUE;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gboolean _tmp52_ = FALSE;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp52_ = TRUE;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 4960 "PiwigoPublishing.c"
- gint _tmp50_ = 0;
- PublishingPiwigoCategory** _tmp51_ = NULL;
- gint _tmp51__length1 = 0;
+#line 5036 "PiwigoPublishing.c"
+ gint _tmp54_ = 0;
+ PublishingPiwigoCategory** _tmp55_ = NULL;
+ gint _tmp55__length1 = 0;
gchar** upcatids = NULL;
- PublishingPiwigoCategory** _tmp52_ = NULL;
- gint _tmp52__length1 = 0;
- gint _tmp53_ = 0;
- PublishingPiwigoCategory* _tmp54_ = NULL;
- const gchar* _tmp55_ = NULL;
- gchar** _tmp56_ = NULL;
- gchar** _tmp57_ = NULL;
+ PublishingPiwigoCategory** _tmp56_ = NULL;
+ gint _tmp56__length1 = 0;
+ gint _tmp57_ = 0;
+ PublishingPiwigoCategory* _tmp58_ = NULL;
+ const gchar* _tmp59_ = NULL;
+ gchar** _tmp60_ = NULL;
+ gchar** _tmp61_ = NULL;
gint upcatids_length1 = 0;
gint _upcatids_size_ = 0;
GString* builder = NULL;
- GString* _tmp58_ = NULL;
- PublishingPiwigoCategory** _tmp84_ = NULL;
- gint _tmp84__length1 = 0;
- gint _tmp85_ = 0;
- PublishingPiwigoCategory* _tmp86_ = NULL;
- GString* _tmp87_ = NULL;
- const gchar* _tmp88_ = NULL;
- gchar* _tmp89_ = NULL;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp48_) {
-#line 4985 "PiwigoPublishing.c"
- gint _tmp49_ = 0;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = i;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- i = _tmp49_ + 1;
-#line 4991 "PiwigoPublishing.c"
+ GString* _tmp62_ = NULL;
+ PublishingPiwigoCategory** _tmp76_ = NULL;
+ gint _tmp76__length1 = 0;
+ gint _tmp77_ = 0;
+ PublishingPiwigoCategory* _tmp78_ = NULL;
+ GString* _tmp79_ = NULL;
+ const gchar* _tmp80_ = NULL;
+ gchar* _tmp81_ = NULL;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!_tmp52_) {
+#line 5061 "PiwigoPublishing.c"
+ gint _tmp53_ = 0;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp53_ = i;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ i = _tmp53_ + 1;
+#line 5067 "PiwigoPublishing.c"
}
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = FALSE;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = i;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = self->priv->categories;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51__length1 = self->priv->categories_length1;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp50_ < _tmp51__length1)) {
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp52_ = FALSE;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp54_ = i;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp55_ = self->priv->categories;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp55__length1 = self->priv->categories_length1;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!(_tmp54_ < _tmp55__length1)) {
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 5005 "PiwigoPublishing.c"
+#line 5081 "PiwigoPublishing.c"
}
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = self->priv->categories;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52__length1 = self->priv->categories_length1;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp53_ = i;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp54_ = _tmp52_[_tmp53_];
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55_ = _tmp54_->uppercats;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp57_ = _tmp56_ = g_strsplit (_tmp55_, ",", 0);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- upcatids = _tmp57_;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- upcatids_length1 = _vala_array_length (_tmp56_);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp56_ = self->priv->categories;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp56__length1 = self->priv->categories_length1;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp57_ = i;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp58_ = _tmp56_[_tmp57_];
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp59_ = _tmp58_->uppercats;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp61_ = _tmp60_ = g_strsplit (_tmp59_, ",", 0);
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ upcatids = _tmp61_;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ upcatids_length1 = _vala_array_length (_tmp60_);
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_upcatids_size_ = upcatids_length1;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp58_ = g_string_new ("");
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- builder = _tmp58_;
-#line 5029 "PiwigoPublishing.c"
- {
- gint j = 0;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- j = 0;
-#line 5034 "PiwigoPublishing.c"
- {
- gboolean _tmp59_ = FALSE;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp59_ = TRUE;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- while (TRUE) {
-#line 5041 "PiwigoPublishing.c"
- gint _tmp61_ = 0;
- gchar** _tmp62_ = NULL;
- gint _tmp62__length1 = 0;
- GString* _tmp63_ = NULL;
- GString* _tmp83_ = NULL;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp59_) {
-#line 5049 "PiwigoPublishing.c"
- gint _tmp60_ = 0;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp60_ = j;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- j = _tmp60_ + 1;
-#line 5055 "PiwigoPublishing.c"
- }
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp59_ = FALSE;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp61_ = j;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp62_ = upcatids;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp62__length1 = upcatids_length1;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp61_ < _tmp62__length1)) {
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- break;
-#line 5069 "PiwigoPublishing.c"
- }
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp63_ = builder;
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_string_append (_tmp63_, "/ ");
-#line 5075 "PiwigoPublishing.c"
- {
- gint k = 0;
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- k = 0;
-#line 5080 "PiwigoPublishing.c"
- {
- gboolean _tmp64_ = FALSE;
+ _tmp62_ = g_string_new ("");
#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp64_ = TRUE;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- while (TRUE) {
-#line 5087 "PiwigoPublishing.c"
- gint _tmp66_ = 0;
- PublishingPiwigoCategory** _tmp67_ = NULL;
- gint _tmp67__length1 = 0;
- gchar** _tmp68_ = NULL;
- gint _tmp68__length1 = 0;
- gint _tmp69_ = 0;
- const gchar* _tmp70_ = NULL;
- PublishingPiwigoCategory** _tmp71_ = NULL;
- gint _tmp71__length1 = 0;
- gint _tmp72_ = 0;
- PublishingPiwigoCategory* _tmp73_ = NULL;
- gint _tmp74_ = 0;
- gchar* _tmp75_ = NULL;
- gchar* _tmp76_ = NULL;
- gboolean _tmp77_ = FALSE;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp64_) {
+ builder = _tmp62_;
#line 5105 "PiwigoPublishing.c"
- gint _tmp65_ = 0;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp65_ = k;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- k = _tmp65_ + 1;
-#line 5111 "PiwigoPublishing.c"
- }
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp64_ = FALSE;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp66_ = k;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp67_ = self->priv->categories;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp67__length1 = self->priv->categories_length1;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp66_ < _tmp67__length1)) {
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- break;
-#line 5125 "PiwigoPublishing.c"
- }
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp68_ = upcatids;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp68__length1 = upcatids_length1;
+ {
+ gint j = 0;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp69_ = j;
+ j = 0;
+#line 5110 "PiwigoPublishing.c"
+ {
+ gboolean _tmp63_ = FALSE;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp70_ = _tmp68_[_tmp69_];
+ _tmp63_ = TRUE;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp71_ = self->priv->categories;
+ while (TRUE) {
+#line 5117 "PiwigoPublishing.c"
+ gint _tmp65_ = 0;
+ gchar** _tmp66_ = NULL;
+ gint _tmp66__length1 = 0;
+ GString* _tmp67_ = NULL;
+ GString* _tmp68_ = NULL;
+ GeeHashMap* _tmp69_ = NULL;
+ gchar** _tmp70_ = NULL;
+ gint _tmp70__length1 = 0;
+ gint _tmp71_ = 0;
+ const gchar* _tmp72_ = NULL;
+ gpointer _tmp73_ = NULL;
+ gchar* _tmp74_ = NULL;
+ GString* _tmp75_ = NULL;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp71__length1 = self->priv->categories_length1;
+ if (!_tmp63_) {
+#line 5133 "PiwigoPublishing.c"
+ gint _tmp64_ = 0;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp72_ = k;
+ _tmp64_ = j;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp73_ = _tmp71_[_tmp72_];
+ j = _tmp64_ + 1;
+#line 5139 "PiwigoPublishing.c"
+ }
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp74_ = _tmp73_->id;
+ _tmp63_ = FALSE;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp75_ = g_strdup_printf ("%i", _tmp74_);
+ _tmp65_ = j;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp76_ = _tmp75_;
+ _tmp66_ = upcatids;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp77_ = g_strcmp0 (_tmp70_, _tmp76_) == 0;
+ _tmp66__length1 = upcatids_length1;
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp76_);
+ if (!(_tmp65_ < _tmp66__length1)) {
#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp77_) {
-#line 5155 "PiwigoPublishing.c"
- GString* _tmp78_ = NULL;
- PublishingPiwigoCategory** _tmp79_ = NULL;
- gint _tmp79__length1 = 0;
- gint _tmp80_ = 0;
- PublishingPiwigoCategory* _tmp81_ = NULL;
- const gchar* _tmp82_ = NULL;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp78_ = builder;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp79_ = self->priv->categories;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp79__length1 = self->priv->categories_length1;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp80_ = k;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp81_ = _tmp79_[_tmp80_];
+ break;
+#line 5153 "PiwigoPublishing.c"
+ }
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp82_ = _tmp81_->name;
+ _tmp67_ = builder;
#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_string_append (_tmp78_, _tmp82_);
+ g_string_append (_tmp67_, "/ ");
#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- break;
-#line 5178 "PiwigoPublishing.c"
- }
- }
- }
- }
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp83_ = builder;
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_string_append (_tmp83_, " ");
-#line 5187 "PiwigoPublishing.c"
+ _tmp68_ = builder;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp69_ = id_map;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp70_ = upcatids;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp70__length1 = upcatids_length1;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp71_ = j;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp72_ = _tmp70_[_tmp71_];
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp73_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_);
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp74_ = (gchar*) _tmp73_;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_string_append (_tmp68_, _tmp74_);
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp74_);
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp75_ = builder;
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_string_append (_tmp75_, " ");
+#line 5183 "PiwigoPublishing.c"
}
}
}
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp84_ = self->priv->categories;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp84__length1 = self->priv->categories_length1;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp85_ = i;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp86_ = _tmp84_[_tmp85_];
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp87_ = builder;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp88_ = _tmp87_->str;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp89_ = g_strdup (_tmp88_);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp86_->display_name);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp86_->display_name = _tmp89_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp76_ = self->priv->categories;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp76__length1 = self->priv->categories_length1;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp77_ = i;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp78_ = _tmp76_[_tmp77_];
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp79_ = builder;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp80_ = _tmp79_->str;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp81_ = g_strdup (_tmp80_);
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp78_->display_name);
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp78_->display_name = _tmp81_;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_string_free0 (builder);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
upcatids = (_vala_array_free (upcatids, upcatids_length1, (GDestroyNotify) g_free), NULL);
-#line 5213 "PiwigoPublishing.c"
+#line 5209 "PiwigoPublishing.c"
}
}
}
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (id_map);
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uppercats);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 5225 "PiwigoPublishing.c"
+#line 5223 "PiwigoPublishing.c"
}
goto __finally40;
__catch40_spit_publishing_publishing_error:
{
GError* err = NULL;
- GError* _tmp90_ = NULL;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ GError* _tmp82_ = NULL;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:648: ERROR: on_category_fetch_complete");
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp82_ = err;
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp82_);
#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:650: ERROR: on_category_fetch_complete");
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp90_ = err;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp90_);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5246 "PiwigoPublishing.c"
+#line 5244 "PiwigoPublishing.c"
}
__finally40:
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5257 "PiwigoPublishing.c"
+#line 5255 "PiwigoPublishing.c"
}
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (self);
-#line 5261 "PiwigoPublishing.c"
+#line 5259 "PiwigoPublishing.c"
}
@@ -5278,31 +5276,31 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
guint _tmp3_ = 0U;
PublishingRESTSupportTransaction* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:666: EVENT: on_category_fetch_error");
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:664: EVENT: on_category_fetch_error");
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = bad_txn;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = bad_txn;
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = bad_txn;
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = err;
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5300 "PiwigoPublishing.c"
+#line 5298 "PiwigoPublishing.c"
}
@@ -5312,16 +5310,16 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
* This action method shows the publishing options pane.
*/
static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self) {
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked ((PublishingPiwigoPiwigoPublisher*) self);
-#line 5312 "PiwigoPublishing.c"
+#line 5310 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self) {
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked ((PublishingPiwigoPiwigoPublisher*) self, parameters, strip_metadata);
-#line 5319 "PiwigoPublishing.c"
+#line 5317 "PiwigoPublishing.c"
}
@@ -5341,55 +5339,55 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
SpitPublishingPluginHost* _tmp10_ = NULL;
GtkWidget* _tmp11_ = NULL;
GtkWidget* _tmp12_ = NULL;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:676: ACTION: installing publishing options pane");
#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:678: ACTION: installing publishing options pane");
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->categories;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1__length1 = self->priv->categories_length1;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = publishing_piwigo_piwigo_publisher_get_last_category (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_piwigo_publisher_get_last_permission_level (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = publishing_piwigo_piwigo_publisher_get_last_photo_size (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_piwigo_piwigo_publisher_get_last_title_as_comment (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = publishing_piwigo_publishing_options_pane_new (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_, _tmp7_);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
opts_pane = _tmp8_;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (opts_pane, "logout", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout, self, 0);
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (opts_pane, "publish", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish, self, 0);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = self->priv->host;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = self->priv->host;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = publishing_piwigo_publishing_options_pane_get_default_widget (opts_pane);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = _tmp11_;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_dialog_default_widget (_tmp10_, _tmp12_);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_tmp12_);
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (opts_pane);
-#line 5387 "PiwigoPublishing.c"
+#line 5385 "PiwigoPublishing.c"
}
@@ -5397,16 +5395,16 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
* Event triggered when the user clicks logout in the publishing options pane.
*/
static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_logout_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5397 "PiwigoPublishing.c"
+#line 5395 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_logout_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5404 "PiwigoPublishing.c"
+#line 5402 "PiwigoPublishing.c"
}
@@ -5415,41 +5413,41 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
PublishingPiwigoSession* _tmp0_ = NULL;
PublishingPiwigoSessionLogoutTransaction* _tmp1_ = NULL;
GError * _inner_error_ = NULL;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:694: EVENT: on_publishing_options_pane_logout_cl" \
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:692: EVENT: on_publishing_options_pane_logout_cl" \
"icked");
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->session;
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = publishing_piwigo_session_logout_transaction_new (_tmp0_);
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
logout_trans = _tmp1_;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5427 "PiwigoPublishing.c"
+#line 5425 "PiwigoPublishing.c"
{
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5435 "PiwigoPublishing.c"
+#line 5433 "PiwigoPublishing.c"
goto __catch41_spit_publishing_publishing_error;
}
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5446 "PiwigoPublishing.c"
+#line 5444 "PiwigoPublishing.c"
}
}
goto __finally41;
@@ -5457,37 +5455,37 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
{
GError* err = NULL;
GError* _tmp2_ = NULL;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:702: ERROR: on_publishing_options_pane_logout_cl" \
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:700: ERROR: on_publishing_options_pane_logout_cl" \
"icked");
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = err;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp2_);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 5466 "PiwigoPublishing.c"
+#line 5464 "PiwigoPublishing.c"
}
__finally41:
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5479 "PiwigoPublishing.c"
+#line 5477 "PiwigoPublishing.c"
}
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 5483 "PiwigoPublishing.c"
+#line 5481 "PiwigoPublishing.c"
}
@@ -5503,31 +5501,31 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi
PublishingRESTSupportTransaction* _tmp2_ = NULL;
guint _tmp3_ = 0U;
PublishingPiwigoSession* _tmp4_ = NULL;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:714: EVENT: on_logout_network_complete");
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:712: EVENT: on_logout_network_complete");
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = txn;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = txn;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->session;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_deauthenticate (_tmp4_);
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 5523 "PiwigoPublishing.c"
+#line 5521 "PiwigoPublishing.c"
}
@@ -5541,31 +5539,31 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
guint _tmp3_ = 0U;
PublishingRESTSupportTransaction* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:730: EVENT: on_logout_network_error");
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:728: EVENT: on_logout_network_error");
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = bad_txn;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = bad_txn;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = bad_txn;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = err;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5561 "PiwigoPublishing.c"
+#line 5559 "PiwigoPublishing.c"
}
@@ -5580,9 +5578,9 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
* @param parameters the publishing parameters
*/
static gpointer _publishing_piwigo_publishing_parameters_ref0 (gpointer self) {
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_piwigo_publishing_parameters_ref (self) : NULL;
-#line 5578 "PiwigoPublishing.c"
+#line 5576 "PiwigoPublishing.c"
}
@@ -5593,50 +5591,50 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
PublishingPiwigoCategory* _tmp4_ = NULL;
gboolean _tmp5_ = FALSE;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters));
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:748: EVENT: on_publishing_options_pane_publish_c" \
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:746: EVENT: on_publishing_options_pane_publish_c" \
"licked");
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = parameters;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp0_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->parameters = _tmp1_;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = strip_metadata;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->strip_metadata = _tmp2_;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = parameters;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_->category;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp5_) {
-#line 5615 "PiwigoPublishing.c"
+#line 5613 "PiwigoPublishing.c"
PublishingPiwigoPublishingParameters* _tmp6_ = NULL;
PublishingPiwigoCategory* _tmp7_ = NULL;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = parameters;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_->category;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp7_);
-#line 5624 "PiwigoPublishing.c"
+#line 5622 "PiwigoPublishing.c"
} else {
gboolean _tmp8_ = FALSE;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = self->priv->strip_metadata;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_upload (self, _tmp8_);
-#line 5631 "PiwigoPublishing.c"
+#line 5629 "PiwigoPublishing.c"
}
}
@@ -5671,21 +5669,21 @@ static gchar* string_strip (const gchar* self) {
result = _result_;
#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 5666 "PiwigoPublishing.c"
+#line 5664 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_add_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5673 "PiwigoPublishing.c"
+#line 5671 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_category_add_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5680 "PiwigoPublishing.c"
+#line 5678 "PiwigoPublishing.c"
}
@@ -5717,100 +5715,100 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
PublishingPiwigoCategoriesAddTransaction* _tmp23_ = NULL;
PublishingPiwigoCategoriesAddTransaction* _tmp24_ = NULL;
GError * _inner_error_ = NULL;
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (category));
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = category;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _tmp0_->name;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = g_strdup_printf ("ACTION: creating a new category: %s", _tmp1_);
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = _tmp2_;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:771: %s", _tmp3_);
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:769: %s", _tmp3_);
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp3_);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = category;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_assert (_tmp5_, "category.is_local()");
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = self->priv->host;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp6_, TRUE);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = self->priv->host;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _ ("Creating album %s…");
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = category;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = _tmp9_->name;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = g_strdup_printf (_tmp8_, _tmp10_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = _tmp11_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp12_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp12_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = self->priv->session;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = category;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = _tmp14_->name;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = string_strip (_tmp15_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = _tmp16_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = category;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = _tmp18_->uppercats;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = atoi (_tmp19_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = category;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp22_ = _tmp21_->comment;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = publishing_piwigo_categories_add_transaction_new (_tmp13_, _tmp17_, _tmp20_, _tmp22_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp24_ = _tmp23_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp17_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
creation_trans = _tmp24_;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5786 "PiwigoPublishing.c"
+#line 5784 "PiwigoPublishing.c"
{
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5794 "PiwigoPublishing.c"
+#line 5792 "PiwigoPublishing.c"
goto __catch42_spit_publishing_publishing_error;
}
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5805 "PiwigoPublishing.c"
+#line 5803 "PiwigoPublishing.c"
}
}
goto __finally42;
@@ -5818,36 +5816,36 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
{
GError* err = NULL;
GError* _tmp25_ = NULL;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:785: ERROR: do_create_category");
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:783: ERROR: do_create_category");
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp25_ = err;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp25_);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 5825 "PiwigoPublishing.c"
+#line 5823 "PiwigoPublishing.c"
}
__finally42:
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5838 "PiwigoPublishing.c"
+#line 5836 "PiwigoPublishing.c"
}
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 5842 "PiwigoPublishing.c"
+#line 5840 "PiwigoPublishing.c"
}
@@ -5864,25 +5862,25 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
PublishingRESTSupportTransaction* _tmp2_ = NULL;
guint _tmp3_ = 0U;
GError * _inner_error_ = NULL;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:798: EVENT: on_category_add_complete");
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:796: EVENT: on_category_add_complete");
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = txn;
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = txn;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 5877 "PiwigoPublishing.c"
+#line 5875 "PiwigoPublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
PublishingRESTSupportTransaction* _tmp4_ = NULL;
@@ -5908,129 +5906,129 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
PublishingPiwigoCategory* _tmp20_ = NULL;
gint _tmp21_ = 0;
gboolean _tmp22_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = txn;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _tmp7_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp6_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
doc = _tmp8_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5921 "PiwigoPublishing.c"
+#line 5919 "PiwigoPublishing.c"
goto __catch43_spit_publishing_publishing_error;
}
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5930 "PiwigoPublishing.c"
+#line 5928 "PiwigoPublishing.c"
}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = doc;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
rsp = _tmp10_;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = doc;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = rsp;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "id", &_inner_error_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = _tmp14_;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5952 "PiwigoPublishing.c"
+#line 5950 "PiwigoPublishing.c"
goto __catch43_spit_publishing_publishing_error;
}
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 5963 "PiwigoPublishing.c"
+#line 5961 "PiwigoPublishing.c"
}
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
id_node = _tmp11_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = id_node;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = (gchar*) xmlNodeGetContent (_tmp15_);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
id_string = _tmp16_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = id_string;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = atoi (_tmp17_);
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
id = _tmp18_;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = self->priv->parameters;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = _tmp19_->category;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = id;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_->id = _tmp21_;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp22_ = self->priv->strip_metadata;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_upload (self, _tmp22_);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (id_string);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 5995 "PiwigoPublishing.c"
+#line 5993 "PiwigoPublishing.c"
}
goto __finally43;
__catch43_spit_publishing_publishing_error:
{
GError* err = NULL;
GError* _tmp23_ = NULL;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:815: ERROR: on_category_add_complete");
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:813: ERROR: on_category_add_complete");
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = err;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp23_);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 6014 "PiwigoPublishing.c"
+#line 6012 "PiwigoPublishing.c"
}
__finally43:
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 6025 "PiwigoPublishing.c"
+#line 6023 "PiwigoPublishing.c"
}
}
@@ -6045,31 +6043,31 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
guint _tmp3_ = 0U;
PublishingRESTSupportTransaction* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:827: EVENT: on_category_add_error");
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:825: EVENT: on_category_add_error");
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = bad_txn;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = bad_txn;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = bad_txn;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = err;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 6064 "PiwigoPublishing.c"
+#line 6062 "PiwigoPublishing.c"
}
@@ -6077,23 +6075,23 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
* Upload action: the big one, the one we've been waiting for!
*/
static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_upload_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender, num_photos_published);
-#line 6074 "PiwigoPublishing.c"
+#line 6072 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_upload_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 6081 "PiwigoPublishing.c"
+#line 6079 "PiwigoPublishing.c"
}
static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_on_upload_status_updated ((PublishingPiwigoPiwigoPublisher*) self, file_number, fraction_complete);
-#line 6088 "PiwigoPublishing.c"
+#line 6086 "PiwigoPublishing.c"
}
@@ -6132,113 +6130,113 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
PublishingPiwigoSession* _tmp27_ = NULL;
PublishingPiwigoPublishingParameters* _tmp28_ = NULL;
PublishingPiwigoUploader* _tmp29_ = NULL;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = strip_metadata;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->strip_metadata = _tmp0_;
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:836: ACTION: uploading pictures");
#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:838: ACTION: uploading pictures");
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->host;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->parameters;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = _tmp2_->category;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_->id;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_last_category (self, _tmp4_);
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = self->priv->parameters;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_->perm_level;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_->id;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_last_permission_level (self, _tmp7_);
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = self->priv->parameters;
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = _tmp8_->photo_size;
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = _tmp9_->id;
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_last_photo_size (self, _tmp10_);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = self->priv->parameters;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = _tmp11_->title_as_comment;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_last_title_as_comment (self, _tmp12_);
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = self->priv->parameters;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = _tmp13_->no_upload_tags;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (self, _tmp14_);
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = strip_metadata;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (self, _tmp15_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = self->priv->host;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = self->priv->parameters;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = _tmp17_->photo_size;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = _tmp18_->id;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = self->priv->strip_metadata;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = spit_publishing_plugin_host_serialize_publishables (_tmp16_, _tmp19_, _tmp20_, &_tmp21_, &_tmp22_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter = _tmp23_;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target = _tmp21_;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = _tmp22_;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp24_ = self->priv->host;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp26_ = spit_publishing_plugin_host_get_publishables (_tmp24_, &_tmp25_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables = _tmp26_;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables_length1 = _tmp25_;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishables_size_ = publishables_length1;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp27_ = self->priv->session;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp28_ = self->priv->parameters;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp29_ = publishing_piwigo_uploader_new (_tmp27_, publishables, publishables_length1, _tmp28_);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
uploader = _tmp29_;
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 6233 "PiwigoPublishing.c"
+#line 6231 "PiwigoPublishing.c"
}
@@ -6251,27 +6249,27 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
guint _tmp1_ = 0U;
PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
guint _tmp3_ = 0U;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:863: EVENT: on_upload_complete");
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:861: EVENT: on_upload_complete");
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = uploader;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = uploader;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_success_pane (self);
-#line 6266 "PiwigoPublishing.c"
+#line 6264 "PiwigoPublishing.c"
}
@@ -6285,29 +6283,29 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo
PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
guint _tmp3_ = 0U;
GError* _tmp4_ = NULL;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:880: EVENT: on_upload_error");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:878: EVENT: on_upload_error");
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = uploader;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = uploader;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = err;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 6302 "PiwigoPublishing.c"
+#line 6300 "PiwigoPublishing.c"
}
@@ -6323,38 +6321,38 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
void* _tmp3__target = NULL;
gint _tmp4_ = 0;
gdouble _tmp5_ = 0.0;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 6326 "PiwigoPublishing.c"
+#line 6324 "PiwigoPublishing.c"
}
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = completed_fraction;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:894: EVENT: uploader reports upload %.2f percent" \
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:892: EVENT: uploader reports upload %.2f percent" \
" complete.", 100.0 * _tmp1_);
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->progress_reporter;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2__target = self->priv->progress_reporter_target;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->progress_reporter;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3__target = self->priv->progress_reporter_target;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = file_number;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = completed_fraction;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 6348 "PiwigoPublishing.c"
+#line 6346 "PiwigoPublishing.c"
}
@@ -6364,19 +6362,19 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self) {
SpitPublishingPluginHost* _tmp0_ = NULL;
SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:903: ACTION: installing success pane");
#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:905: ACTION: installing success pane");
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->host;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 6370 "PiwigoPublishing.c"
+#line 6368 "PiwigoPublishing.c"
}
@@ -6385,17 +6383,17 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP
*/
static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
GError* _tmp0_ = NULL;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:918: EVENT: on_network_error");
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:916: EVENT: on_network_error");
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = err;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp0_);
-#line 6389 "PiwigoPublishing.c"
+#line 6387 "PiwigoPublishing.c"
}
@@ -6412,130 +6410,130 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
gchar* _tmp19_ = NULL;
gchar* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:926: ACTION: do_show_error");
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:924: ACTION: do_show_error");
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = g_strdup ("UNKNOWN");
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp0_;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = e;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp1_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return;
-#line 6424 "PiwigoPublishing.c"
+#line 6422 "PiwigoPublishing.c"
} else {
GError* _tmp2_ = NULL;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = e;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 6431 "PiwigoPublishing.c"
+#line 6429 "PiwigoPublishing.c"
gchar* _tmp3_ = NULL;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = g_strdup ("COMMUNICATION_FAILED");
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp3_;
-#line 6439 "PiwigoPublishing.c"
+#line 6437 "PiwigoPublishing.c"
} else {
GError* _tmp4_ = NULL;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = e;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 6446 "PiwigoPublishing.c"
+#line 6444 "PiwigoPublishing.c"
gchar* _tmp5_ = NULL;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = g_strdup ("PROTOCOL_ERROR");
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp5_;
-#line 6454 "PiwigoPublishing.c"
+#line 6452 "PiwigoPublishing.c"
} else {
GError* _tmp6_ = NULL;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = e;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 6461 "PiwigoPublishing.c"
+#line 6459 "PiwigoPublishing.c"
gchar* _tmp7_ = NULL;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = g_strdup ("SERVICE_ERROR");
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp7_;
-#line 6469 "PiwigoPublishing.c"
+#line 6467 "PiwigoPublishing.c"
} else {
GError* _tmp8_ = NULL;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = e;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 6476 "PiwigoPublishing.c"
+#line 6474 "PiwigoPublishing.c"
gchar* _tmp9_ = NULL;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = g_strdup ("MALFORMED_RESPONSE");
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp9_;
-#line 6484 "PiwigoPublishing.c"
+#line 6482 "PiwigoPublishing.c"
} else {
GError* _tmp10_ = NULL;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = e;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 6491 "PiwigoPublishing.c"
+#line 6489 "PiwigoPublishing.c"
gchar* _tmp11_ = NULL;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp11_;
-#line 6499 "PiwigoPublishing.c"
+#line 6497 "PiwigoPublishing.c"
} else {
GError* _tmp12_ = NULL;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = e;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 6506 "PiwigoPublishing.c"
+#line 6504 "PiwigoPublishing.c"
gchar* _tmp13_ = NULL;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = g_strdup ("EXPIRED_SESSION");
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp13_;
-#line 6514 "PiwigoPublishing.c"
+#line 6512 "PiwigoPublishing.c"
} else {
GError* _tmp14_ = NULL;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = e;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_error_matches (_tmp14_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 6521 "PiwigoPublishing.c"
+#line 6519 "PiwigoPublishing.c"
gchar* _tmp15_ = NULL;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = g_strdup ("SECURE_CONNECTION_FAILED");
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
error_type = _tmp15_;
-#line 6529 "PiwigoPublishing.c"
+#line 6527 "PiwigoPublishing.c"
}
}
}
@@ -6544,27 +6542,27 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
}
}
}
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = error_type;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = e;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = _tmp17_->message;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp16_, _tmp18_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = _tmp19_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:947: %s", _tmp20_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:945: %s", _tmp20_);
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp20_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = _ ("An error message occurred when publishing to Piwigo. Please try again.");
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_do_show_error_message (self, _tmp21_);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (error_type);
-#line 6558 "PiwigoPublishing.c"
+#line 6556 "PiwigoPublishing.c"
}
@@ -6574,19 +6572,19 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message) {
SpitPublishingPluginHost* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (message != NULL);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:955: ACTION: do_show_error_message");
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:953: ACTION: do_show_error_message");
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->host;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = message;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 6580 "PiwigoPublishing.c"
+#line 6578 "PiwigoPublishing.c"
}
@@ -6600,39 +6598,39 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
* @return the value of pwg_id if present or null if not found
*/
static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return g_boxed_copy (soup_cookie_get_type (), self);
-#line 6596 "PiwigoPublishing.c"
+#line 6594 "PiwigoPublishing.c"
}
static gpointer __vala_SoupCookie_copy0 (gpointer self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? _vala_SoupCookie_copy (self) : NULL;
-#line 6603 "PiwigoPublishing.c"
+#line 6601 "PiwigoPublishing.c"
}
static void _vala_SoupCookie_free (SoupCookie* self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_boxed_free (soup_cookie_get_type (), self);
-#line 6610 "PiwigoPublishing.c"
+#line 6608 "PiwigoPublishing.c"
}
static void __vala_SoupCookie_free0_ (gpointer var) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(var == NULL) ? NULL : (var = (_vala_SoupCookie_free (var), NULL));
-#line 6617 "PiwigoPublishing.c"
+#line 6615 "PiwigoPublishing.c"
}
static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_slist_foreach (self, (GFunc) __vala_SoupCookie_free0_, NULL);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_slist_free (self);
-#line 6626 "PiwigoPublishing.c"
+#line 6624 "PiwigoPublishing.c"
}
@@ -6644,159 +6642,159 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
SoupMessage* _tmp2_ = NULL;
GSList* _tmp3_ = NULL;
GSList* _tmp4_ = NULL;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn), NULL);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pwg_id = NULL;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = txn;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = publishing_rest_support_transaction_get_message (_tmp0_);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = _tmp1_;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = soup_cookies_from_response (_tmp2_);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_tmp2_);
-#line 6656 "PiwigoPublishing.c"
+#line 6654 "PiwigoPublishing.c"
{
GSList* cookie_collection = NULL;
GSList* cookie_it = NULL;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
cookie_collection = _tmp4_;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (cookie_it = cookie_collection; cookie_it != NULL; cookie_it = cookie_it->next) {
-#line 6664 "PiwigoPublishing.c"
+#line 6662 "PiwigoPublishing.c"
SoupCookie* _tmp5_ = NULL;
SoupCookie* cookie = NULL;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
cookie = _tmp5_;
-#line 6671 "PiwigoPublishing.c"
+#line 6669 "PiwigoPublishing.c"
{
SoupCookie* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = cookie;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = soup_cookie_get_name (_tmp6_);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (_tmp7_, "pwg_id") == 0) {
-#line 6681 "PiwigoPublishing.c"
+#line 6679 "PiwigoPublishing.c"
SoupCookie* _tmp8_ = NULL;
const gchar* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = cookie;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = soup_cookie_get_value (_tmp8_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = g_strdup (_tmp9_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (pwg_id);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pwg_id = _tmp10_;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = pwg_id;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:979: Found pwg_id %s", _tmp11_);
-#line 6700 "PiwigoPublishing.c"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp11_);
+#line 6698 "PiwigoPublishing.c"
}
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__vala_SoupCookie_free0 (cookie);
-#line 6704 "PiwigoPublishing.c"
+#line 6702 "PiwigoPublishing.c"
}
}
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__g_slist_free___vala_SoupCookie_free0_0 (cookie_collection);
-#line 6709 "PiwigoPublishing.c"
+#line 6707 "PiwigoPublishing.c"
}
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = pwg_id;
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 6715 "PiwigoPublishing.c"
+#line 6713 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwigoPublisherClass * klass) {
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoPiwigoPublisherPrivate));
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_piwigo_publisher_finalize;
-#line 6726 "PiwigoPublishing.c"
+#line 6724 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_get_service;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_is_running;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->start = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_start;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_stop;
-#line 6741 "PiwigoPublishing.c"
+#line 6739 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPiwigoPublisher * self) {
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE (self);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->running = FALSE;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->strip_metadata = FALSE;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories = NULL;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories_length1 = 0;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->_categories_size_ = self->priv->categories_length1;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->parameters = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter = NULL;
-#line 6762 "PiwigoPublishing.c"
+#line 6760 "PiwigoPublishing.c"
}
static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj) {
PublishingPiwigoPiwigoPublisher * self;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->service);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->host);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_piwigo_publisher_parent_class)->finalize (obj);
-#line 6790 "PiwigoPublishing.c"
+#line 6788 "PiwigoPublishing.c"
}
@@ -6821,36 +6819,36 @@ PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_typ
gint _tmp1__length1 = 0;
PublishingPiwigoPublishingParameters* _tmp2_ = NULL;
PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = publishables;
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1__length1 = publishables_length1;
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = parameters;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp2_);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->parameters = _tmp3_;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 6837 "PiwigoPublishing.c"
+#line 6835 "PiwigoPublishing.c"
}
PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_uploader_construct (PUBLISHING_PIWIGO_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6844 "PiwigoPublishing.c"
+#line 6842 "PiwigoPublishing.c"
}
@@ -6863,61 +6861,61 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_
SpitPublishingPublishable* _tmp3_ = NULL;
PublishingPiwigoImagesAddTransaction* _tmp4_ = NULL;
PublishingRESTSupportTransaction* _tmp5_ = NULL;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->parameters;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishable;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = publishing_piwigo_images_add_transaction_new (_tmp1_, _tmp2_, _tmp3_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp5_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 6879 "PiwigoPublishing.c"
+#line 6877 "PiwigoPublishing.c"
}
static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass * klass) {
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_piwigo_uploader_finalize;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate));
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_piwigo_uploader_real_create_transaction;
-#line 6892 "PiwigoPublishing.c"
+#line 6890 "PiwigoPublishing.c"
}
static void publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self) {
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE (self);
-#line 6899 "PiwigoPublishing.c"
+#line 6897 "PiwigoPublishing.c"
}
static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
PublishingPiwigoUploader * self;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_piwigo_uploader_parent_class)->finalize (obj);
-#line 6911 "PiwigoPublishing.c"
+#line 6909 "PiwigoPublishing.c"
}
@@ -6933,37 +6931,50 @@ GType publishing_piwigo_uploader_get_type (void) {
}
-static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_atomic_int_inc (&_data1_->_ref_count_);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return _data1_;
-#line 6932 "PiwigoPublishing.c"
-}
-
-
-static void block1_data_unref (void * _userdata_) {
- Block1Data* _data1_;
- _data1_ = (Block1Data*) _userdata_;
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+ PublishingPiwigoSSLErrorPane * self = NULL;
+ GTlsCertificate* cert = NULL;
+ gchar* text = NULL;
+ PublishingPiwigoSessionLoginTransaction* _tmp0_ = NULL;
+ GTlsCertificate* _tmp1_ = NULL;
+ gchar* _tmp2_ = NULL;
+ const gchar* _tmp3_ = NULL;
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (host != NULL, NULL);
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 6941 "PiwigoPublishing.c"
- PublishingPiwigoSSLErrorPane* self;
+ _tmp0_ = transaction;
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = _data1_->self;
+ _tmp2_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp1_);
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_data1_->cert);
+ _g_object_unref0 (cert);
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self);
+ cert = _tmp1_;
#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_slice_free (Block1Data, _data1_);
-#line 6951 "PiwigoPublishing.c"
- }
+ text = _tmp2_;
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = host;
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", "default-id", "default", "cert", cert, "error-text", text, "host", _tmp3_, NULL);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (text);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (cert);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return self;
+#line 6957 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
+#line 6964 "PiwigoPublishing.c"
}
-static void ___lambda4_ (Block1Data* _data1_) {
- PublishingPiwigoSSLErrorPane* self;
+static void __lambda4_ (PublishingPiwigoSSLErrorPane* self) {
GcrSimpleCertificate* simple_cert = NULL;
GTlsCertificate* _tmp0_ = NULL;
GByteArray* _tmp1_ = NULL;
@@ -6974,450 +6985,449 @@ static void ___lambda4_ (Block1Data* _data1_) {
GcrSimpleCertificate* _tmp5_ = NULL;
GcrSimpleCertificate* _tmp6_ = NULL;
GcrCertificateWidget* widget = NULL;
- GcrCertificateWidget* _tmp7_ = NULL;
+ GcrSimpleCertificate* _tmp7_ = NULL;
+ GcrCertificateWidget* _tmp8_ = NULL;
+ gboolean use_header = FALSE;
+ GtkSettings* _tmp9_ = NULL;
+ GtkDialogFlags flags = 0;
+ gboolean _tmp10_ = FALSE;
GtkDialog* dialog = NULL;
- GtkDialog* _tmp8_ = NULL;
- GtkBox* _tmp9_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = _data1_->self;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = _data1_->cert;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ const gchar* _tmp12_ = NULL;
+ gchar* _tmp13_ = NULL;
+ gchar* _tmp14_ = NULL;
+ gchar* _tmp15_ = NULL;
+ gchar* _tmp16_ = NULL;
+ gchar* _tmp17_ = NULL;
+ GtkDialogFlags _tmp18_ = 0;
+ const gchar* _tmp19_ = NULL;
+ GtkDialog* _tmp20_ = NULL;
+ GtkDialog* _tmp21_ = NULL;
+ GtkBox* _tmp22_ = NULL;
+ GcrCertificateWidget* _tmp23_ = NULL;
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_cert;
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_object_get (_tmp0_, "certificate", &_tmp1_, NULL);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = _tmp1_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = _tmp2_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_->data;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4__length1 = (gint) _tmp3_->len;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = (GcrSimpleCertificate*) gcr_simple_certificate_new (_tmp4_, _tmp4__length1);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_byte_array_unref0 (_tmp3_);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
simple_cert = _tmp6_;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = gcr_certificate_widget_new (G_TYPE_CHECK_INSTANCE_CAST (simple_cert, gcr_certificate_get_type (), GcrCertificate));
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_ref_sink (_tmp7_);
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- widget = _tmp7_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = (GtkDialog*) gtk_dialog_new ();
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = simple_cert;
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = gcr_certificate_widget_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gcr_certificate_get_type (), GcrCertificate));
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_object_ref_sink (_tmp8_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- dialog = _tmp8_;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (widget, gtk_widget_get_type (), GtkWidget));
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_dialog_add_button (dialog, "_OK", (gint) GTK_RESPONSE_OK);
#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_dialog_set_default_response (dialog, (gint) GTK_RESPONSE_OK);
+ widget = _tmp8_;
#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), 640, -1);
+ use_header = TRUE;
#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
+ _tmp9_ = gtk_settings_get_default ();
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_dialog_run (dialog);
+ flags = (GtkDialogFlags) 0;
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = use_header;
#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (_tmp10_) {
+#line 7038 "PiwigoPublishing.c"
+ GtkDialogFlags _tmp11_ = 0;
+#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = flags;
+#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ flags = _tmp11_ | GTK_DIALOG_USE_HEADER_BAR;
+#line 7044 "PiwigoPublishing.c"
+ }
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = _ ("Certificate of %s");
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = publishing_piwigo_ssl_error_pane_get_host (self);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp14_ = _tmp13_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp15_ = _tmp14_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp16_ = g_strdup_printf (_tmp12_, _tmp15_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp17_ = _tmp16_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp18_ = flags;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp19_ = _ ("_OK");
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp20_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp17_, NULL, _tmp18_, _tmp19_, GTK_RESPONSE_OK, NULL);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_ref_sink (_tmp20_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp21_ = _tmp20_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp17_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp15_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ dialog = _tmp21_;
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp22_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp23_ = widget;
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_dialog_set_default_response (dialog, (gint) GTK_RESPONSE_OK);
+#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), 640, -1);
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_dialog_run (dialog);
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (dialog);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (widget);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (simple_cert);
-#line 7028 "PiwigoPublishing.c"
+#line 7096 "PiwigoPublishing.c"
}
-static void ____lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- ___lambda4_ (self);
-#line 7035 "PiwigoPublishing.c"
+static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ __lambda4_ ((PublishingPiwigoSSLErrorPane*) self);
+#line 7103 "PiwigoPublishing.c"
}
-static void ___lambda5_ (PublishingPiwigoSSLErrorPane* self) {
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_emit_by_name (self, "proceed");
-#line 7042 "PiwigoPublishing.c"
+#line 7110 "PiwigoPublishing.c"
}
-static void ____lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- ___lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7049 "PiwigoPublishing.c"
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ __lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
+#line 7117 "PiwigoPublishing.c"
}
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
- PublishingPiwigoSSLErrorPane * self = NULL;
- GError * _inner_error_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (host != NULL, NULL);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, NULL);
-#line 7062 "PiwigoPublishing.c"
- {
- Block1Data* _data1_;
- GtkBuilder* _tmp0_ = NULL;
- GtkBuilder* _tmp1_ = NULL;
- GtkBuilder* _tmp2_ = NULL;
- GObject* _tmp3_ = NULL;
- GtkWidget* _tmp4_ = NULL;
- GtkLabel* label = NULL;
- GtkBuilder* _tmp5_ = NULL;
- GObject* _tmp6_ = NULL;
- GtkLabel* _tmp7_ = NULL;
- GtkLabel* _tmp8_ = NULL;
- const gchar* _tmp9_ = NULL;
- const gchar* _tmp10_ = NULL;
- gchar* _tmp11_ = NULL;
- gchar* _tmp12_ = NULL;
- GtkLabel* _tmp13_ = NULL;
- GtkBuilder* _tmp14_ = NULL;
- GObject* _tmp15_ = NULL;
- GtkLabel* _tmp16_ = NULL;
- gchar* text = NULL;
- PublishingPiwigoSessionLoginTransaction* _tmp17_ = NULL;
- GTlsCertificate* _tmp18_ = NULL;
- gchar* _tmp19_ = NULL;
- GtkLabel* _tmp20_ = NULL;
- const gchar* _tmp21_ = NULL;
- GtkButton* info = NULL;
- GtkBuilder* _tmp22_ = NULL;
- GObject* _tmp23_ = NULL;
- GtkButton* _tmp24_ = NULL;
- GtkButton* _tmp25_ = NULL;
- GtkButton* proceed = NULL;
- GtkBuilder* _tmp26_ = NULL;
- GObject* _tmp27_ = NULL;
- GtkButton* _tmp28_ = NULL;
- GtkButton* _tmp29_ = NULL;
- GtkWidget* _tmp30_ = NULL;
- GtkContainer* _tmp31_ = NULL;
- GtkContainer* _tmp32_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _data1_ = g_slice_new0 (Block1Data);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _data1_->_ref_count_ = 1;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _data1_->self = g_object_ref (self);
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = gtk_builder_new ();
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->builder);
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->builder = _tmp0_;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = self->priv->builder;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", &_inner_error_);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- block1_data_unref (_data1_);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _data1_ = NULL;
-#line 7124 "PiwigoPublishing.c"
- goto __catch44_g_error;
- }
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = self->priv->builder;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = gtk_builder_get_object (_tmp2_, "content");
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp3_) : NULL);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->content);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->content = _tmp4_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = self->priv->builder;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = gtk_builder_get_object (_tmp5_, "main_text");
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp6_) : NULL);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- label = _tmp7_;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = label;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _ ("This does not look like the real <b>%s</b>. Attackers might be trying " \
-"to steal or alter information going to or from this site (for example," \
-" private messages, credit card information, or passwords).");
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = host;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = g_strdup_printf (_tmp9_, _tmp10_);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp11_;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_label_set_text (_tmp8_, _tmp12_);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp12_);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = label;
+static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
+ PublishingPiwigoSSLErrorPane * self;
+ GtkLabel* label = NULL;
+ GtkBuilder* _tmp0_ = NULL;
+ GtkBuilder* _tmp1_ = NULL;
+ GObject* _tmp2_ = NULL;
+ GtkLabel* _tmp3_ = NULL;
+ GtkLabel* _tmp4_ = NULL;
+ GtkLabel* _tmp5_ = NULL;
+ const gchar* _tmp6_ = NULL;
+ gchar* _tmp7_ = NULL;
+ gchar* _tmp8_ = NULL;
+ gchar* _tmp9_ = NULL;
+ gchar* _tmp10_ = NULL;
+ gchar* _tmp11_ = NULL;
+ GtkLabel* _tmp12_ = NULL;
+ GtkBuilder* _tmp13_ = NULL;
+ GtkBuilder* _tmp14_ = NULL;
+ GObject* _tmp15_ = NULL;
+ GtkLabel* _tmp16_ = NULL;
+ GtkLabel* _tmp17_ = NULL;
+ gchar* _tmp18_ = NULL;
+ gchar* _tmp19_ = NULL;
+ gchar* _tmp20_ = NULL;
+ GtkButton* info = NULL;
+ GtkBuilder* _tmp21_ = NULL;
+ GtkBuilder* _tmp22_ = NULL;
+ GObject* _tmp23_ = NULL;
+ GtkButton* _tmp24_ = NULL;
+ GtkButton* _tmp25_ = NULL;
+ GtkButton* proceed = NULL;
+ GtkBuilder* _tmp26_ = NULL;
+ GtkBuilder* _tmp27_ = NULL;
+ GObject* _tmp28_ = NULL;
+ GtkButton* _tmp29_ = NULL;
+ GtkButton* _tmp30_ = NULL;
#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_label_set_use_markup (_tmp13_, TRUE);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = self->priv->builder;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = gtk_builder_get_object (_tmp14_, "ssl_errors");
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp15_) : NULL);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (label);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- label = _tmp16_;
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane), G_TYPE_OBJECT, GObject));
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = transaction;
+ _tmp0_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp18_);
+ _tmp1_ = _tmp0_;
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_data1_->cert);
+ _tmp2_ = gtk_builder_get_object (_tmp1_, "main_text");
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _data1_->cert = _tmp18_;
+ _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp2_) : NULL);
#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- text = _tmp19_;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = label;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = text;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_label_set_text (_tmp20_, _tmp21_);
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = self->priv->builder;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = gtk_builder_get_object (_tmp22_, "default");
+ _tmp4_ = _tmp3_;
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_tmp1_);
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ label = _tmp4_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = label;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6_ = _ ("This does not look like the real <b>%s</b>. Attackers might be trying " \
+"to steal or alter information going to or from this site (for example," \
+" private messages, credit card information, or passwords).");
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = publishing_piwigo_ssl_error_pane_get_host (self);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = _tmp7_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = _tmp8_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = g_strdup_printf (_tmp6_, _tmp9_);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = _tmp10_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_label_set_text (_tmp5_, _tmp11_);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp11_);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp9_);
#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
+ _tmp12_ = label;
#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- info = _tmp24_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = info;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_data (_tmp25_, "clicked", (GCallback) ____lambda4__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = self->priv->builder;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = gtk_builder_get_object (_tmp26_, "proceed_button");
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_button_get_type ()) ? ((GtkButton*) _tmp27_) : NULL);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- proceed = _tmp28_;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = proceed;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (_tmp29_, "clicked", (GCallback) ____lambda5__gtk_button_clicked, self, 0);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = self->priv->content;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = gtk_widget_get_parent (_tmp30_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = _tmp31_;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp32_ != NULL) {
-#line 7221 "PiwigoPublishing.c"
- GtkWidget* _tmp33_ = NULL;
- GtkContainer* _tmp34_ = NULL;
- GtkContainer* _tmp35_ = NULL;
- GtkWidget* _tmp36_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = self->priv->content;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = gtk_widget_get_parent (_tmp33_);
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = _tmp34_;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = self->priv->content;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_container_remove (_tmp35_, _tmp36_);
-#line 7236 "PiwigoPublishing.c"
- }
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (proceed);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (info);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (text);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (label);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- block1_data_unref (_data1_);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _data1_ = NULL;
-#line 7250 "PiwigoPublishing.c"
- }
- goto __finally44;
- __catch44_g_error:
- {
- GError* _error_ = NULL;
- const gchar* _tmp37_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _error_ = _inner_error_;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _inner_error_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp37_ = _error_->message;
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_warning ("PiwigoPublishing.vala:1053: Failed to create ui file: %s", _tmp37_);
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_assert_not_reached ();
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_error_free0 (_error_);
-#line 7269 "PiwigoPublishing.c"
- }
- __finally44:
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_clear_error (&_inner_error_);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return NULL;
-#line 7280 "PiwigoPublishing.c"
- }
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return self;
-#line 7284 "PiwigoPublishing.c"
+ gtk_label_set_use_markup (_tmp12_, TRUE);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp14_ = _tmp13_;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp15_ = gtk_builder_get_object (_tmp14_, "ssl_errors");
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp15_) : NULL);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (label);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ label = _tmp16_;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_tmp14_);
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp17_ = label;
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp18_ = publishing_piwigo_ssl_error_pane_get_error_text (self);
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp19_ = _tmp18_;
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp20_ = _tmp19_;
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_label_set_text (_tmp17_, _tmp20_);
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp20_);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp21_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp22_ = _tmp21_;
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp23_ = gtk_builder_get_object (_tmp22_, "default");
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp25_ = _tmp24_;
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_tmp22_);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ info = _tmp25_;
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_signal_connect_object (info, "clicked", (GCallback) ___lambda4__gtk_button_clicked, self, 0);
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp26_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp27_ = _tmp26_;
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp28_ = gtk_builder_get_object (_tmp27_, "proceed_button");
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL);
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp30_ = _tmp29_;
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_tmp27_);
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ proceed = _tmp30_;
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (proceed);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (info);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (label);
+#line 7263 "PiwigoPublishing.c"
}
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
-#line 7291 "PiwigoPublishing.c"
+gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self) {
+ gchar* result;
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_host;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp1_;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 7281 "PiwigoPublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_ssl_error_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
- PublishingPiwigoSSLErrorPane * self;
- SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 7304 "PiwigoPublishing.c"
+static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (self->priv->_host);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_host = _tmp1_;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "host");
+#line 7300 "PiwigoPublishing.c"
}
-static GtkWidget* publishing_piwigo_ssl_error_pane_real_get_widget (SpitPublishingDialogPane* base) {
- PublishingPiwigoSSLErrorPane * self;
- GtkWidget* result = NULL;
- GtkWidget* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->content;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self) {
+ GTlsCertificate* result;
+ GTlsCertificate* _tmp0_ = NULL;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_cert;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 7323 "PiwigoPublishing.c"
+#line 7315 "PiwigoPublishing.c"
}
-GtkWidget* publishing_piwigo_ssl_error_pane_get_default_widget (PublishingPiwigoSSLErrorPane* self) {
- GtkWidget* result = NULL;
- GtkBuilder* _tmp0_ = NULL;
- GObject* _tmp1_ = NULL;
- GtkWidget* _tmp2_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->builder;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = gtk_builder_get_object (_tmp0_, "default");
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp1_) : NULL);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp2_;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 7344 "PiwigoPublishing.c"
+static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value) {
+ GTlsCertificate* _tmp0_ = NULL;
+ GTlsCertificate* _tmp1_ = NULL;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->_cert);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_cert = _tmp1_;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "cert");
+#line 7334 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
- PublishingPiwigoSSLErrorPane * self;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self) {
+ gchar* result;
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_error_text;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp1_;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
#line 7352 "PiwigoPublishing.c"
}
-static void publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
- PublishingPiwigoSSLErrorPane * self;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
-#line 7360 "PiwigoPublishing.c"
+static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (self->priv->_error_text);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_error_text = _tmp1_;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "error-text");
+#line 7371 "PiwigoPublishing.c"
}
static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErrorPaneClass * klass) {
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_ssl_error_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoSSLErrorPanePrivate));
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ ((GObjectClass *) klass)->constructed = publishing_piwigo_ssl_error_pane_real_constructed;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_ssl_error_pane_get_property;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (klass)->set_property = _vala_publishing_piwigo_ssl_error_pane_set_property;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_ssl_error_pane_finalize;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 7373 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_get_preferred_geometry;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_get_widget;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_on_pane_installed;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled;
-#line 7388 "PiwigoPublishing.c"
+#line 7396 "PiwigoPublishing.c"
}
static void publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self) {
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE (self);
-#line 7395 "PiwigoPublishing.c"
+#line 7403 "PiwigoPublishing.c"
}
static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj) {
PublishingPiwigoSSLErrorPane * self;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->builder);
+ _g_free0 (self->priv->_host);
#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->content);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->_cert);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (self->priv->_error_text);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->finalize (obj);
-#line 7409 "PiwigoPublishing.c"
+#line 7419 "PiwigoPublishing.c"
}
@@ -7425,16 +7435,82 @@ GType publishing_piwigo_ssl_error_pane_get_type (void) {
static volatile gsize publishing_piwigo_ssl_error_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_ssl_error_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSSLErrorPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_ssl_error_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSSLErrorPane), 0, (GInstanceInitFunc) publishing_piwigo_ssl_error_pane_instance_init, NULL };
- static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType publishing_piwigo_ssl_error_pane_type_id;
- publishing_piwigo_ssl_error_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingPiwigoSSLErrorPane", &g_define_type_info, 0);
- g_type_add_interface_static (publishing_piwigo_ssl_error_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+ publishing_piwigo_ssl_error_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, "PublishingPiwigoSSLErrorPane", &g_define_type_info, 0);
g_once_init_leave (&publishing_piwigo_ssl_error_pane_type_id__volatile, publishing_piwigo_ssl_error_pane_type_id);
}
return publishing_piwigo_ssl_error_pane_type_id__volatile;
}
+static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+ PublishingPiwigoSSLErrorPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ switch (property_id) {
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_host (self));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_object (value, publishing_piwigo_ssl_error_pane_get_cert (self));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_error_text (self));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 7458 "PiwigoPublishing.c"
+ default:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 7464 "PiwigoPublishing.c"
+ }
+}
+
+
+static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+ PublishingPiwigoSSLErrorPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ switch (property_id) {
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_ssl_error_pane_set_host (self, g_value_get_string (value));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_ssl_error_pane_set_cert (self, g_value_get_object (value));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_ssl_error_pane_set_error_text (self, g_value_get_string (value));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 7492 "PiwigoPublishing.c"
+ default:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 7498 "PiwigoPublishing.c"
+ }
+}
+
+
GType publishing_piwigo_authentication_pane_mode_get_type (void) {
static volatile gsize publishing_piwigo_authentication_pane_mode_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_authentication_pane_mode_type_id__volatile)) {
@@ -7447,444 +7523,361 @@ GType publishing_piwigo_authentication_pane_mode_get_type (void) {
}
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+ PublishingPiwigoAuthenticationPane * self = NULL;
+ PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
+ PublishingPiwigoPiwigoPublisher* _tmp1_ = NULL;
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = mode;
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = publisher;
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", _tmp0_, "publisher", _tmp1_, NULL);
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return self;
+#line 7529 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
+#line 7536 "PiwigoPublishing.c"
+}
+
+
static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_user_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7442 "PiwigoPublishing.c"
+#line 7543 "PiwigoPublishing.c"
}
static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_url_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7449 "PiwigoPublishing.c"
+#line 7550 "PiwigoPublishing.c"
}
static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_password_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7456 "PiwigoPublishing.c"
+#line 7557 "PiwigoPublishing.c"
}
static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_on_login_button_clicked ((PublishingPiwigoAuthenticationPane*) self);
-#line 7463 "PiwigoPublishing.c"
+#line 7564 "PiwigoPublishing.c"
}
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
- PublishingPiwigoAuthenticationPane * self = NULL;
- GtkBox* _tmp0_ = NULL;
- GError * _inner_error_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, NULL);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_ref_sink (_tmp0_);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->pane_widget);
+static void publishing_piwigo_authentication_pane_real_constructed (GObject* base) {
+ PublishingPiwigoAuthenticationPane * self;
+ GtkBuilder* builder = NULL;
+ GtkBuilder* _tmp0_ = NULL;
+ GtkLabel* message_label = NULL;
+ GtkBuilder* _tmp1_ = NULL;
+ GObject* _tmp2_ = NULL;
+ GtkLabel* _tmp3_ = NULL;
+ PublishingPiwigoAuthenticationPaneMode _tmp4_ = 0;
+ GtkBuilder* _tmp17_ = NULL;
+ GObject* _tmp18_ = NULL;
+ GtkEntry* _tmp19_ = NULL;
+ gchar* persistent_url = NULL;
+ PublishingPiwigoPiwigoPublisher* _tmp20_ = NULL;
+ gchar* _tmp21_ = NULL;
+ const gchar* _tmp22_ = NULL;
+ GtkBuilder* _tmp25_ = NULL;
+ GObject* _tmp26_ = NULL;
+ GtkEntry* _tmp27_ = NULL;
+ gchar* persistent_username = NULL;
+ PublishingPiwigoPiwigoPublisher* _tmp28_ = NULL;
+ gchar* _tmp29_ = NULL;
+ const gchar* _tmp30_ = NULL;
+ GtkBuilder* _tmp33_ = NULL;
+ GObject* _tmp34_ = NULL;
+ GtkEntry* _tmp35_ = NULL;
+ gchar* persistent_password = NULL;
+ PublishingPiwigoPiwigoPublisher* _tmp36_ = NULL;
+ gchar* _tmp37_ = NULL;
+ const gchar* _tmp38_ = NULL;
+ GtkBuilder* _tmp41_ = NULL;
+ GObject* _tmp42_ = NULL;
+ GtkSwitch* _tmp43_ = NULL;
+ GtkSwitch* _tmp44_ = NULL;
+ PublishingPiwigoPiwigoPublisher* _tmp45_ = NULL;
+ gboolean _tmp46_ = FALSE;
+ GtkBuilder* _tmp47_ = NULL;
+ GObject* _tmp48_ = NULL;
+ GtkButton* _tmp49_ = NULL;
+ GtkEntry* _tmp50_ = NULL;
+ GtkEntry* _tmp51_ = NULL;
+ GtkEntry* _tmp52_ = NULL;
+ GtkButton* _tmp53_ = NULL;
+ PublishingPiwigoPiwigoPublisher* _tmp54_ = NULL;
+ SpitPublishingPluginHost* _tmp55_ = NULL;
+ SpitPublishingPluginHost* _tmp56_ = NULL;
+ GtkButton* _tmp57_ = NULL;
#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->pane_widget = _tmp0_;
-#line 7483 "PiwigoPublishing.c"
- {
- GtkBuilder* _tmp1_ = NULL;
- GtkBuilder* _tmp2_ = NULL;
- GtkBuilder* _tmp3_ = NULL;
- GtkAlignment* align = NULL;
- GtkBuilder* _tmp4_ = NULL;
- GObject* _tmp5_ = NULL;
- GtkAlignment* _tmp6_ = NULL;
- GtkLabel* message_label = NULL;
- GtkBuilder* _tmp7_ = NULL;
- GObject* _tmp8_ = NULL;
- GtkLabel* _tmp9_ = NULL;
- PublishingPiwigoAuthenticationPaneMode _tmp10_ = 0;
- GtkBuilder* _tmp23_ = NULL;
- GObject* _tmp24_ = NULL;
- GtkEntry* _tmp25_ = NULL;
- gchar* persistent_url = NULL;
- PublishingPiwigoPiwigoPublisher* _tmp26_ = NULL;
- gchar* _tmp27_ = NULL;
- const gchar* _tmp28_ = NULL;
- GtkBuilder* _tmp31_ = NULL;
- GObject* _tmp32_ = NULL;
- GtkEntry* _tmp33_ = NULL;
- gchar* persistent_username = NULL;
- PublishingPiwigoPiwigoPublisher* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
- GtkBuilder* _tmp39_ = NULL;
- GObject* _tmp40_ = NULL;
- GtkEntry* _tmp41_ = NULL;
- gchar* persistent_password = NULL;
- PublishingPiwigoPiwigoPublisher* _tmp42_ = NULL;
- gchar* _tmp43_ = NULL;
- const gchar* _tmp44_ = NULL;
- GtkBuilder* _tmp47_ = NULL;
- GObject* _tmp48_ = NULL;
- GtkCheckButton* _tmp49_ = NULL;
- GtkCheckButton* _tmp50_ = NULL;
- PublishingPiwigoPiwigoPublisher* _tmp51_ = NULL;
- gboolean _tmp52_ = FALSE;
- GtkBuilder* _tmp53_ = NULL;
- GObject* _tmp54_ = NULL;
- GtkButton* _tmp55_ = NULL;
- GtkEntry* _tmp56_ = NULL;
- GtkEntry* _tmp57_ = NULL;
- GtkEntry* _tmp58_ = NULL;
- GtkButton* _tmp59_ = NULL;
- GtkAlignment* _tmp60_ = NULL;
- GtkBox* _tmp61_ = NULL;
- PublishingPiwigoPiwigoPublisher* _tmp62_ = NULL;
- SpitPublishingPluginHost* _tmp63_ = NULL;
- SpitPublishingPluginHost* _tmp64_ = NULL;
- GtkButton* _tmp65_ = NULL;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = gtk_builder_new ();
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane), G_TYPE_OBJECT, GObject));
#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->builder);
+ _tmp0_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->builder = _tmp1_;
+ builder = _tmp0_;
#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = self->priv->builder;
+ _tmp1_ = builder;
#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", &_inner_error_);
+ _tmp2_ = gtk_builder_get_object (_tmp1_, "message_label");
#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7549 "PiwigoPublishing.c"
- goto __catch45_g_error;
- }
+ _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp2_) : NULL);
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ message_label = _tmp3_;
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = self->priv->builder;
+ _tmp4_ = self->priv->_mode;
#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_builder_connect_signals (_tmp3_, NULL);
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = self->priv->builder;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = gtk_builder_get_object (_tmp4_, "alignment");
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp5_) : NULL);
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- align = _tmp6_;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = self->priv->builder;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = gtk_builder_get_object (_tmp7_, "message_label");
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
+ switch (_tmp4_) {
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
+#line 7637 "PiwigoPublishing.c"
+ {
+ GtkLabel* _tmp5_ = NULL;
+ const gchar* _tmp6_ = NULL;
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = message_label;
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6_ = publishing_piwigo_authentication_pane_INTRO_MESSAGE;
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_label_set_text (_tmp5_, _tmp6_);
#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- message_label = _tmp9_;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = mode;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- switch (_tmp10_) {
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
-#line 7578 "PiwigoPublishing.c"
- {
- GtkLabel* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
+ break;
+#line 7649 "PiwigoPublishing.c"
+ }
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
+#line 7653 "PiwigoPublishing.c"
+ {
+ GtkLabel* _tmp7_ = NULL;
+ const gchar* _tmp8_ = NULL;
+ const gchar* _tmp9_ = NULL;
+ gchar* _tmp10_ = NULL;
+ gchar* _tmp11_ = NULL;
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = message_label;
+ _tmp7_ = message_label;
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = publishing_piwigo_authentication_pane_INTRO_MESSAGE;
+ _tmp8_ = _ ("Invalid URL");
#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_label_set_text (_tmp11_, _tmp12_);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- break;
-#line 7590 "PiwigoPublishing.c"
- }
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
-#line 7594 "PiwigoPublishing.c"
- {
- GtkLabel* _tmp13_ = NULL;
- const gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
- gchar* _tmp17_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = message_label;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = _ ("Invalid URL");
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = _tmp16_;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_label_set_markup (_tmp13_, _tmp17_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp17_);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- break;
-#line 7617 "PiwigoPublishing.c"
- }
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 7621 "PiwigoPublishing.c"
- {
- GtkLabel* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- const gchar* _tmp20_ = NULL;
- gchar* _tmp21_ = NULL;
- gchar* _tmp22_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = message_label;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = _ ("Invalid User Name or Password");
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp19_, _tmp20_);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = _tmp21_;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_label_set_markup (_tmp18_, _tmp22_);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp22_);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- break;
-#line 7644 "PiwigoPublishing.c"
- }
- default:
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp8_, _tmp9_);
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = _tmp10_;
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_label_set_markup (_tmp7_, _tmp11_);
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp11_);
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 7649 "PiwigoPublishing.c"
+#line 7676 "PiwigoPublishing.c"
}
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = self->priv->builder;
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = gtk_builder_get_object (_tmp23_, "url_entry");
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->url_entry);
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->url_entry = _tmp25_;
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
+#line 7680 "PiwigoPublishing.c"
+ {
+ GtkLabel* _tmp12_ = NULL;
+ const gchar* _tmp13_ = NULL;
+ const gchar* _tmp14_ = NULL;
+ gchar* _tmp15_ = NULL;
+ gchar* _tmp16_ = NULL;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = message_label;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = _ ("Invalid User Name or Password");
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp14_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp13_, _tmp14_);
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp16_ = _tmp15_;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_label_set_markup (_tmp12_, _tmp16_);
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp16_);
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 7703 "PiwigoPublishing.c"
+ }
+ default:
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 7708 "PiwigoPublishing.c"
+ }
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp17_ = builder;
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp18_ = gtk_builder_get_object (_tmp17_, "url_entry");
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->url_entry);
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->url_entry = _tmp19_;
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp20_ = self->priv->_publisher;
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp21_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp20_);
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ persistent_url = _tmp21_;
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp22_ = persistent_url;
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (_tmp22_ != NULL) {
+#line 7730 "PiwigoPublishing.c"
+ GtkEntry* _tmp23_ = NULL;
+ const gchar* _tmp24_ = NULL;
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp23_ = self->priv->url_entry;
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp24_ = persistent_url;
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_entry_set_text (_tmp23_, _tmp24_);
+#line 7739 "PiwigoPublishing.c"
+ }
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp25_ = builder;
#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = publisher;
+ _tmp26_ = gtk_builder_get_object (_tmp25_, "username_entry");
#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp26_);
+ _tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- persistent_url = _tmp27_;
+ _g_object_unref0 (self->priv->username_entry);
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->username_entry = _tmp27_;
#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = persistent_url;
+ _tmp28_ = self->priv->_publisher;
#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp28_ != NULL) {
-#line 7671 "PiwigoPublishing.c"
- GtkEntry* _tmp29_ = NULL;
- const gchar* _tmp30_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = self->priv->url_entry;
+ _tmp29_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp28_);
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ persistent_username = _tmp29_;
#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = persistent_url;
+ _tmp30_ = persistent_username;
#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_entry_set_text (_tmp29_, _tmp30_);
-#line 7680 "PiwigoPublishing.c"
- }
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = self->priv->builder;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = gtk_builder_get_object (_tmp31_, "username_entry");
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->username_entry);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->username_entry = _tmp33_;
+ if (_tmp30_ != NULL) {
+#line 7761 "PiwigoPublishing.c"
+ GtkEntry* _tmp31_ = NULL;
+ const gchar* _tmp32_ = NULL;
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp31_ = self->priv->username_entry;
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp32_ = persistent_username;
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_entry_set_text (_tmp31_, _tmp32_);
+#line 7770 "PiwigoPublishing.c"
+ }
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp33_ = builder;
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp34_ = gtk_builder_get_object (_tmp33_, "password_entry");
#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = publisher;
+ _tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp34_) : NULL);
#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp34_);
+ _g_object_unref0 (self->priv->password_entry);
#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- persistent_username = _tmp35_;
+ self->priv->password_entry = _tmp35_;
#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = persistent_username;
+ _tmp36_ = self->priv->_publisher;
#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp36_ != NULL) {
-#line 7702 "PiwigoPublishing.c"
- GtkEntry* _tmp37_ = NULL;
- const gchar* _tmp38_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp37_ = self->priv->username_entry;
+ _tmp37_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp36_);
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ persistent_password = _tmp37_;
#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_ = persistent_username;
+ _tmp38_ = persistent_password;
#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_entry_set_text (_tmp37_, _tmp38_);
-#line 7711 "PiwigoPublishing.c"
- }
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp39_ = self->priv->builder;
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp40_ = gtk_builder_get_object (_tmp39_, "password_entry");
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp40_) : NULL);
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->password_entry);
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->password_entry = _tmp41_;
+ if (_tmp38_ != NULL) {
+#line 7792 "PiwigoPublishing.c"
+ GtkEntry* _tmp39_ = NULL;
+ const gchar* _tmp40_ = NULL;
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp39_ = self->priv->password_entry;
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp40_ = persistent_password;
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_entry_set_text (_tmp39_, _tmp40_);
+#line 7801 "PiwigoPublishing.c"
+ }
#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42_ = publisher;
+ _tmp41_ = builder;
#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp43_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp42_);
+ _tmp42_ = gtk_builder_get_object (_tmp41_, "remember_password_checkbutton");
#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- persistent_password = _tmp43_;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = persistent_password;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp44_ != NULL) {
-#line 7733 "PiwigoPublishing.c"
- GtkEntry* _tmp45_ = NULL;
- const gchar* _tmp46_ = NULL;
+ _tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_switch_get_type ()) ? ((GtkSwitch*) _tmp42_) : NULL);
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->remember_password_checkbutton);
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->remember_password_checkbutton = _tmp43_;
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = self->priv->password_entry;
+ _tmp44_ = self->priv->remember_password_checkbutton;
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = persistent_password;
+ _tmp45_ = self->priv->_publisher;
#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_entry_set_text (_tmp45_, _tmp46_);
-#line 7742 "PiwigoPublishing.c"
- }
+ _tmp46_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp45_);
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_switch_set_active (_tmp44_, _tmp46_);
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = self->priv->builder;
+ _tmp47_ = builder;
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = gtk_builder_get_object (_tmp47_, "remember_password_checkbutton");
+ _tmp48_ = gtk_builder_get_object (_tmp47_, "login_button");
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp48_) : NULL);
+ _tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, gtk_button_get_type ()) ? ((GtkButton*) _tmp48_) : NULL);
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->remember_password_checkbutton);
+ _g_object_unref0 (self->priv->login_button);
#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->remember_password_checkbutton = _tmp49_;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = self->priv->remember_password_checkbutton;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = publisher;
+ self->priv->login_button = _tmp49_;
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp51_);
+ _tmp50_ = self->priv->username_entry;
#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp51_ = self->priv->url_entry;
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp53_ = self->priv->builder;
+ _tmp52_ = self->priv->password_entry;
#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp54_ = gtk_builder_get_object (_tmp53_, "login_button");
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp54_, gtk_button_get_type ()) ? ((GtkButton*) _tmp54_) : NULL);
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->login_button);
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->login_button = _tmp55_;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp56_ = self->priv->username_entry;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp53_ = self->priv->login_button;
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_signal_connect_object (_tmp53_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp57_ = self->priv->url_entry;
+ _tmp54_ = self->priv->_publisher;
#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp58_ = self->priv->password_entry;
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp59_ = self->priv->login_button;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (_tmp59_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp60_ = align;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp61_ = self->priv->pane_widget;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.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 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp62_ = publisher;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp63_ = publishing_piwigo_piwigo_publisher_get_host (_tmp62_);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp64_ = _tmp63_;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp65_ = self->priv->login_button;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- spit_publishing_plugin_host_set_dialog_default_widget (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget));
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp64_);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (persistent_password);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (persistent_username);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (persistent_url);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (message_label);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (align);
-#line 7816 "PiwigoPublishing.c"
- }
- goto __finally45;
- __catch45_g_error:
- {
- GError* e = NULL;
- GError* _tmp66_ = NULL;
- const gchar* _tmp67_ = NULL;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- e = _inner_error_;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _inner_error_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp66_ = e;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp67_ = _tmp66_->message;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_warning ("PiwigoPublishing.vala:1154: Could not load UI: %s", _tmp67_);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_error_free0 (e);
-#line 7836 "PiwigoPublishing.c"
- }
- __finally45:
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_clear_error (&_inner_error_);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return NULL;
-#line 7847 "PiwigoPublishing.c"
- }
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return self;
-#line 7851 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 7858 "PiwigoPublishing.c"
-}
-
-
-GtkWidget* publishing_piwigo_authentication_pane_get_default_widget (PublishingPiwigoAuthenticationPane* self) {
- GtkWidget* result = NULL;
- GtkButton* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), NULL);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->login_button;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 7876 "PiwigoPublishing.c"
+ _tmp55_ = publishing_piwigo_piwigo_publisher_get_host (_tmp54_);
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp56_ = _tmp55_;
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp57_ = self->priv->login_button;
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ spit_publishing_plugin_host_set_dialog_default_widget (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_tmp56_);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (persistent_password);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (persistent_username);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (persistent_url);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (message_label);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (builder);
+#line 7869 "PiwigoPublishing.c"
}
@@ -7895,56 +7888,56 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
const gchar* _tmp3_ = NULL;
GtkEntry* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
- GtkCheckButton* _tmp6_ = NULL;
+ GtkSwitch* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->url_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->username_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->password_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = self->priv->remember_password_checkbutton;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = gtk_switch_get_active (_tmp6_);
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 7909 "PiwigoPublishing.c"
+#line 7902 "PiwigoPublishing.c"
}
static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7918 "PiwigoPublishing.c"
+#line 7911 "PiwigoPublishing.c"
}
static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7927 "PiwigoPublishing.c"
+#line 7920 "PiwigoPublishing.c"
}
static void publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7936 "PiwigoPublishing.c"
+#line 7929 "PiwigoPublishing.c"
}
@@ -7955,124 +7948,144 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
guint _tmp3_ = 0U;
guint _tmp4_ = 0U;
GtkButton* _tmp11_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->url_entry;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = gtk_entry_get_text_length (_tmp2_);
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp4_ != ((guint) 0)) {
-#line 7957 "PiwigoPublishing.c"
+#line 7950 "PiwigoPublishing.c"
GtkEntry* _tmp5_ = NULL;
guint _tmp6_ = 0U;
guint _tmp7_ = 0U;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = self->priv->username_entry;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = gtk_entry_get_text_length (_tmp5_);
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _tmp7_ != ((guint) 0);
-#line 7969 "PiwigoPublishing.c"
+#line 7962 "PiwigoPublishing.c"
} else {
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = FALSE;
-#line 7973 "PiwigoPublishing.c"
+#line 7966 "PiwigoPublishing.c"
}
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp1_) {
-#line 7977 "PiwigoPublishing.c"
+#line 7970 "PiwigoPublishing.c"
GtkEntry* _tmp8_ = NULL;
guint _tmp9_ = 0U;
guint _tmp10_ = 0U;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = self->priv->password_entry;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = gtk_entry_get_text_length (_tmp8_);
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = _tmp9_;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _tmp10_ != ((guint) 0);
-#line 7989 "PiwigoPublishing.c"
+#line 7982 "PiwigoPublishing.c"
} else {
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
-#line 7993 "PiwigoPublishing.c"
+#line 7986 "PiwigoPublishing.c"
}
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = self->priv->login_button;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7999 "PiwigoPublishing.c"
+#line 7992 "PiwigoPublishing.c"
}
-static GtkWidget* publishing_piwigo_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
- PublishingPiwigoAuthenticationPane * self;
- GtkWidget* result = NULL;
- GtkBox* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 8018 "PiwigoPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
- PublishingPiwigoAuthenticationPane * self;
- SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 8031 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
PublishingPiwigoAuthenticationPane * self;
GtkEntry* _tmp0_ = NULL;
GtkEntry* _tmp1_ = NULL;
GtkButton* _tmp2_ = NULL;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS (publishing_piwigo_authentication_pane_parent_class)->on_pane_installed (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->url_entry;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->password_entry;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_entry_set_activates_default (_tmp1_, TRUE);
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->login_button;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 8056 "PiwigoPublishing.c"
+#line 8019 "PiwigoPublishing.c"
}
-static void publishing_piwigo_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
- PublishingPiwigoAuthenticationPane * self;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 8064 "PiwigoPublishing.c"
+PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self) {
+ PublishingPiwigoAuthenticationPaneMode result;
+ PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), 0);
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_mode;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 8034 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value) {
+ PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_mode = _tmp0_;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "mode");
+#line 8048 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self) {
+ PublishingPiwigoPiwigoPublisher* result;
+ PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), NULL);
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_publisher;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 8063 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value) {
+ PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_publisher = _tmp0_;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "publisher");
+#line 8077 "PiwigoPublishing.c"
}
@@ -8083,27 +8096,27 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure
register gpointer data1;
register gpointer data2;
cc = (GCClosure *) closure;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (n_param_values == 5);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data1 = closure->data;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 8083 "PiwigoPublishing.c"
+#line 8096 "PiwigoPublishing.c"
} else {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data1 = param_values->data[0].v_pointer;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = closure->data;
-#line 8089 "PiwigoPublishing.c"
+#line 8102 "PiwigoPublishing.c"
}
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback = (GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 8095 "PiwigoPublishing.c"
+#line 8108 "PiwigoPublishing.c"
}
@@ -8114,83 +8127,74 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
gchar* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoAuthenticationPanePrivate));
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ ((GObjectClass *) klass)->constructed = publishing_piwigo_authentication_pane_real_constructed;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = publishing_piwigo_authentication_pane_real_on_pane_installed;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_authentication_pane_get_property;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (klass)->set_property = _vala_publishing_piwigo_authentication_pane_set_property;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_authentication_pane_finalize;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _ ("Enter the URL of your Piwigo photo library as well as the username and" \
" password associated with your Piwigo account for that library.");
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_INTRO_MESSAGE = _tmp1_;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = _ ("Shotwell cannot contact your Piwigo photo library. Please verify the U" \
"RL you entered");
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = _tmp3_;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _ ("Username and/or password invalid. Please try again");
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = g_strdup (_tmp4_);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp5_;
-#line 8132 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_get_widget;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_get_preferred_geometry;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_on_pane_installed;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_on_pane_uninstalled;
-#line 8147 "PiwigoPublishing.c"
+#line 8157 "PiwigoPublishing.c"
}
static void publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self) {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->pane_widget = NULL;
-#line 8156 "PiwigoPublishing.c"
+#line 8164 "PiwigoPublishing.c"
}
static void publishing_piwigo_authentication_pane_finalize (GObject* obj) {
PublishingPiwigoAuthenticationPane * self;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->builder);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->url_entry);
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->username_entry);
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->password_entry);
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->remember_password_checkbutton);
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->login_button);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->finalize (obj);
-#line 8180 "PiwigoPublishing.c"
+#line 8184 "PiwigoPublishing.c"
}
@@ -8202,655 +8206,572 @@ GType publishing_piwigo_authentication_pane_get_type (void) {
static volatile gsize publishing_piwigo_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoAuthenticationPane), 0, (GInstanceInitFunc) publishing_piwigo_authentication_pane_instance_init, NULL };
- static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType publishing_piwigo_authentication_pane_type_id;
- publishing_piwigo_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingPiwigoAuthenticationPane", &g_define_type_info, 0);
- g_type_add_interface_static (publishing_piwigo_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+ publishing_piwigo_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, "PublishingPiwigoAuthenticationPane", &g_define_type_info, 0);
g_once_init_leave (&publishing_piwigo_authentication_pane_type_id__volatile, publishing_piwigo_authentication_pane_type_id);
}
return publishing_piwigo_authentication_pane_type_id__volatile;
}
+static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+ PublishingPiwigoAuthenticationPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ switch (property_id) {
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_enum (value, publishing_piwigo_authentication_pane_get_mode (self));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_object (value, publishing_piwigo_authentication_pane_get_publisher (self));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 8221 "PiwigoPublishing.c"
+ default:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 8227 "PiwigoPublishing.c"
+ }
+}
+
+
+static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+ PublishingPiwigoAuthenticationPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ switch (property_id) {
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_authentication_pane_set_mode (self, g_value_get_enum (value));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_authentication_pane_set_publisher (self, g_value_get_object (value));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 8249 "PiwigoPublishing.c"
+ default:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 8255 "PiwigoPublishing.c"
+ }
+}
+
+
+static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return self ? publishing_piwigo_category_ref (self) : NULL;
+#line 8263 "PiwigoPublishing.c"
+}
+
+
+static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length) {
+ PublishingPiwigoCategory** result;
+ int i;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = g_new0 (PublishingPiwigoCategory*, length + 1);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ for (i = 0; i < length; i++) {
+#line 8274 "PiwigoPublishing.c"
+ PublishingPiwigoCategory* _tmp0_ = NULL;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result[i] = _tmp0_;
+#line 8280 "PiwigoPublishing.c"
+ }
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 8284 "PiwigoPublishing.c"
+}
+
+
+static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+ gboolean result;
+ result = publishing_piwigo_category_equal ((PublishingPiwigoCategory*) a, (PublishingPiwigoCategory*) b);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 8293 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+ PublishingPiwigoPublishingOptionsPane * self = NULL;
+ gint _tmp0_ = 0;
+ gint _tmp1_ = 0;
+ gint _tmp2_ = 0;
+ gboolean _tmp3_ = FALSE;
+ gboolean _tmp4_ = FALSE;
+ gboolean _tmp5_ = FALSE;
+ PublishingPiwigoCategory** _tmp6_ = NULL;
+ gint _tmp6__length1 = 0;
+ PublishingPiwigoCategory** _tmp7_ = NULL;
+ gint _tmp7__length1 = 0;
+ GeeArrayList* _tmp8_ = NULL;
+ GeeArrayList* _tmp9_ = NULL;
+ PublishingPiwigoPiwigoPublisher* _tmp10_ = NULL;
+ gchar* _tmp11_ = NULL;
+ gchar* _tmp12_ = NULL;
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = last_category;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = last_permission_level;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp2_ = last_photo_size;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = last_title_as_comment;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp4_ = last_no_upload_tags;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = strip_metadata_enabled;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6_ = categories;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6__length1 = categories_length1;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup14 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7__length1 = _tmp6__length1;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, publishing_piwigo_category_unref, _tmp7_, _tmp7__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = _tmp8_;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = publisher;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (_tmp10_);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = _tmp11_;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", "connect-signals", TRUE, "default-id", "publish_button", "last-category", _tmp0_, "last-permission-level", _tmp1_, "last-photo-size", _tmp2_, "last-title-as-comment", _tmp3_, "last-no-upload-tags", _tmp4_, "strip-metadata-enabled", _tmp5_, "existing-categories", _tmp9_, "default-comment", _tmp12_, NULL);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp12_);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_tmp9_);
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return self;
+#line 8354 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
+#line 8361 "PiwigoPublishing.c"
+}
+
+
static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_logout_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8205 "PiwigoPublishing.c"
+#line 8368 "PiwigoPublishing.c"
}
static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_publish_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8212 "PiwigoPublishing.c"
+#line 8375 "PiwigoPublishing.c"
}
static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8219 "PiwigoPublishing.c"
+#line 8382 "PiwigoPublishing.c"
}
static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8226 "PiwigoPublishing.c"
+#line 8389 "PiwigoPublishing.c"
}
static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_new_category_entry_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8233 "PiwigoPublishing.c"
+#line 8396 "PiwigoPublishing.c"
}
static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_on_existing_combo_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8240 "PiwigoPublishing.c"
-}
-
-
-static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return self ? publishing_piwigo_category_ref (self) : NULL;
-#line 8247 "PiwigoPublishing.c"
+#line 8403 "PiwigoPublishing.c"
}
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) {
- PublishingPiwigoCategory** result;
- int i;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = g_new0 (PublishingPiwigoCategory*, length + 1);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- for (i = 0; i < length; i++) {
-#line 8258 "PiwigoPublishing.c"
- PublishingPiwigoCategory* _tmp0_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result[i] = _tmp0_;
-#line 8264 "PiwigoPublishing.c"
- }
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 8268 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
- PublishingPiwigoPublishingOptionsPane * self = NULL;
- GtkBox* _tmp0_ = NULL;
- gint _tmp1_ = 0;
- gint _tmp2_ = 0;
- gint _tmp3_ = 0;
- gboolean _tmp4_ = FALSE;
- gboolean _tmp5_ = FALSE;
- PublishingPiwigoCategory** _tmp78_ = NULL;
- gint _tmp78__length1 = 0;
- PublishingPiwigoCategory** _tmp79_ = NULL;
- gint _tmp79__length1 = 0;
- gint _tmp80_ = 0;
- PublishingPiwigoPermissionLevel** _tmp81_ = NULL;
- gint _tmp82_ = 0;
- PublishingPiwigoSizeEntry** _tmp83_ = NULL;
- GtkTextView* _tmp84_ = NULL;
- GtkTextBuffer* _tmp85_ = NULL;
- GtkTextBuffer* _tmp86_ = NULL;
- PublishingPiwigoPiwigoPublisher* _tmp87_ = NULL;
- gchar* _tmp88_ = NULL;
- gchar* _tmp89_ = NULL;
- GError * _inner_error_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_object_ref_sink (_tmp0_);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->pane_widget = _tmp0_;
+static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base) {
+ PublishingPiwigoPublishingOptionsPane * self;
+ GtkBuilder* builder = NULL;
+ GtkBuilder* _tmp0_ = NULL;
+ GObject* _tmp1_ = NULL;
+ GtkRadioButton* _tmp2_ = NULL;
+ GObject* _tmp3_ = NULL;
+ GtkRadioButton* _tmp4_ = NULL;
+ GObject* _tmp5_ = NULL;
+ GtkComboBoxText* _tmp6_ = NULL;
+ GObject* _tmp7_ = NULL;
+ GtkEntry* _tmp8_ = NULL;
+ GObject* _tmp9_ = NULL;
+ GtkLabel* _tmp10_ = NULL;
+ GObject* _tmp11_ = NULL;
+ GtkComboBoxText* _tmp12_ = NULL;
+ GObject* _tmp13_ = NULL;
+ GtkTextView* _tmp14_ = NULL;
+ GtkTextView* _tmp15_ = NULL;
+ GtkTextBuffer* _tmp16_ = NULL;
+ GtkTextBuffer* _tmp17_ = NULL;
+ GObject* _tmp18_ = NULL;
+ GtkLabel* _tmp19_ = NULL;
+ GObject* _tmp20_ = NULL;
+ GtkComboBoxText* _tmp21_ = NULL;
+ GObject* _tmp22_ = NULL;
+ GtkComboBoxText* _tmp23_ = NULL;
+ GObject* _tmp24_ = NULL;
+ GtkCheckButton* _tmp25_ = NULL;
+ GtkCheckButton* _tmp26_ = NULL;
+ gboolean _tmp27_ = FALSE;
+ GObject* _tmp28_ = NULL;
+ GtkCheckButton* _tmp29_ = NULL;
+ GtkCheckButton* _tmp30_ = NULL;
+ gboolean _tmp31_ = FALSE;
+ GObject* _tmp32_ = NULL;
+ GtkCheckButton* _tmp33_ = NULL;
+ GtkCheckButton* _tmp34_ = NULL;
+ gboolean _tmp35_ = FALSE;
+ GObject* _tmp36_ = NULL;
+ GtkButton* _tmp37_ = NULL;
+ GtkButton* _tmp38_ = NULL;
+ GObject* _tmp39_ = NULL;
+ GtkButton* _tmp40_ = NULL;
+ GtkButton* _tmp41_ = NULL;
+ GtkRadioButton* _tmp42_ = NULL;
+ GtkRadioButton* _tmp43_ = NULL;
+ GtkEntry* _tmp44_ = NULL;
+ GtkComboBoxText* _tmp45_ = NULL;
+ gint _tmp46_ = 0;
+ PublishingPiwigoPermissionLevel** _tmp47_ = NULL;
+ gint _tmp48_ = 0;
+ PublishingPiwigoSizeEntry** _tmp49_ = NULL;
+ GtkTextView* _tmp50_ = NULL;
+ GtkTextBuffer* _tmp51_ = NULL;
+ GtkTextBuffer* _tmp52_ = NULL;
+ const gchar* _tmp53_ = NULL;
+#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
+#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane), G_TYPE_OBJECT, GObject));
+#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ builder = _tmp0_;
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = last_category;
+ _tmp1_ = gtk_builder_get_object (builder, "use_existing_radio");
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp1_) : NULL);
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->use_existing_radio);
#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->last_category = _tmp1_;
+ self->priv->use_existing_radio = _tmp2_;
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = gtk_builder_get_object (builder, "create_new_radio");
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = last_permission_level;
+ _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp3_) : NULL);
#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->last_permission_level = _tmp2_;
+ _g_object_unref0 (self->priv->create_new_radio);
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->create_new_radio = _tmp4_;
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = gtk_builder_get_object (builder, "existing_categories_combo");
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = last_photo_size;
+ _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp5_) : NULL);
#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->last_photo_size = _tmp3_;
+ _g_object_unref0 (self->priv->existing_categories_combo);
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->existing_categories_combo = _tmp6_;
+#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = gtk_builder_get_object (builder, "new_category_entry");
+#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp7_) : NULL);
#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = last_title_as_comment;
+ _g_object_unref0 (self->priv->new_category_entry);
#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->last_title_as_comment = _tmp4_;
+ self->priv->new_category_entry = _tmp8_;
#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = last_no_upload_tags;
+ _tmp9_ = gtk_builder_get_object (builder, "within_existing_label");
#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->last_no_upload_tags = _tmp5_;
-#line 8327 "PiwigoPublishing.c"
- {
- GtkBuilder* _tmp6_ = NULL;
- GtkBuilder* _tmp7_ = NULL;
- GtkBuilder* _tmp8_ = NULL;
- GtkAlignment* align = NULL;
- GtkBuilder* _tmp9_ = NULL;
- GObject* _tmp10_ = NULL;
- GtkAlignment* _tmp11_ = NULL;
- GtkBuilder* _tmp12_ = NULL;
- GObject* _tmp13_ = NULL;
- GtkRadioButton* _tmp14_ = NULL;
- GtkBuilder* _tmp15_ = NULL;
- GObject* _tmp16_ = NULL;
- GtkRadioButton* _tmp17_ = NULL;
- GtkBuilder* _tmp18_ = NULL;
- GObject* _tmp19_ = NULL;
- GtkComboBoxText* _tmp20_ = NULL;
- GtkBuilder* _tmp21_ = NULL;
- GObject* _tmp22_ = NULL;
- GtkEntry* _tmp23_ = NULL;
- GtkBuilder* _tmp24_ = NULL;
- GObject* _tmp25_ = NULL;
- GtkLabel* _tmp26_ = NULL;
- GtkBuilder* _tmp27_ = NULL;
- GObject* _tmp28_ = NULL;
- GtkComboBoxText* _tmp29_ = NULL;
- GtkBuilder* _tmp30_ = NULL;
- GObject* _tmp31_ = NULL;
- GtkTextView* _tmp32_ = NULL;
- GtkTextView* _tmp33_ = NULL;
- GtkTextBuffer* _tmp34_ = NULL;
- GtkTextBuffer* _tmp35_ = NULL;
- GtkBuilder* _tmp36_ = NULL;
- GObject* _tmp37_ = NULL;
- GtkLabel* _tmp38_ = NULL;
- GtkBuilder* _tmp39_ = NULL;
- GObject* _tmp40_ = NULL;
- GtkComboBoxText* _tmp41_ = NULL;
- GtkBuilder* _tmp42_ = NULL;
- GObject* _tmp43_ = NULL;
- GtkComboBoxText* _tmp44_ = NULL;
- GtkBuilder* _tmp45_ = NULL;
- GObject* _tmp46_ = NULL;
- GtkCheckButton* _tmp47_ = NULL;
- GtkCheckButton* _tmp48_ = NULL;
- gboolean _tmp49_ = FALSE;
- GtkBuilder* _tmp50_ = NULL;
- GObject* _tmp51_ = NULL;
- GtkCheckButton* _tmp52_ = NULL;
- GtkCheckButton* _tmp53_ = NULL;
- gboolean _tmp54_ = FALSE;
- GtkBuilder* _tmp55_ = NULL;
- GObject* _tmp56_ = NULL;
- GtkCheckButton* _tmp57_ = NULL;
- GtkCheckButton* _tmp58_ = NULL;
- gboolean _tmp59_ = FALSE;
- GtkBuilder* _tmp60_ = NULL;
- GObject* _tmp61_ = NULL;
- GtkButton* _tmp62_ = NULL;
- GtkButton* _tmp63_ = NULL;
- GtkBuilder* _tmp64_ = NULL;
- GObject* _tmp65_ = NULL;
- GtkButton* _tmp66_ = NULL;
- GtkButton* _tmp67_ = NULL;
- GtkRadioButton* _tmp68_ = NULL;
- GtkRadioButton* _tmp69_ = NULL;
- GtkEntry* _tmp70_ = NULL;
- GtkComboBoxText* _tmp71_ = NULL;
- GtkAlignment* _tmp72_ = NULL;
- GtkBox* _tmp73_ = NULL;
- GtkBox* _tmp74_ = NULL;
- GtkAlignment* _tmp75_ = NULL;
+ _tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp9_) : NULL);
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->within_existing_label);
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->within_existing_label = _tmp10_;
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = gtk_builder_get_object (builder, "within_existing_combo");
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp11_) : NULL);
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->within_existing_combo);
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->within_existing_combo = _tmp12_;
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = gtk_builder_get_object (builder, "album_comment");
#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = gtk_builder_new ();
+ _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp13_) : NULL);
#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->builder);
+ _g_object_unref0 (self->priv->album_comment);
#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->builder = _tmp6_;
+ self->priv->album_comment = _tmp14_;
#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = self->priv->builder;
+ _tmp15_ = self->priv->album_comment;
#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_builder_add_from_resource (_tmp7_, PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", &_inner_error_);
+ _tmp16_ = gtk_text_buffer_new (NULL);
#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8412 "PiwigoPublishing.c"
- goto __catch46_g_error;
- }
+ _tmp17_ = _tmp16_;
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_text_view_set_buffer (_tmp15_, _tmp17_);
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_tmp17_);
#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->builder;
+ _tmp18_ = gtk_builder_get_object (builder, "album_comment_label");
#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_builder_connect_signals (_tmp8_, NULL);
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = self->priv->builder;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = gtk_builder_get_object (_tmp9_, "alignment");
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp10_) : NULL);
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- align = _tmp11_;
-#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = self->priv->builder;
+ _tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp18_) : NULL);
+#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->album_comment_label);
+#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->album_comment_label = _tmp19_;
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp20_ = gtk_builder_get_object (builder, "perms_combo");
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp20_) : NULL);
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->perms_combo);
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->perms_combo = _tmp21_;
#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = gtk_builder_get_object (_tmp12_, "use_existing_radio");
+ _tmp22_ = gtk_builder_get_object (builder, "size_combo");
#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp13_) : NULL);
+ _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp22_) : NULL);
#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->use_existing_radio);
+ _g_object_unref0 (self->priv->size_combo);
#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->use_existing_radio = _tmp14_;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = self->priv->builder;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = gtk_builder_get_object (_tmp15_, "create_new_radio");
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp16_) : NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->create_new_radio);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->create_new_radio = _tmp17_;
+ self->priv->size_combo = _tmp23_;
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = self->priv->builder;
+ _tmp24_ = gtk_builder_get_object (builder, "strip_metadata_check");
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = gtk_builder_get_object (_tmp18_, "existing_categories_combo");
+ _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp24_) : NULL);
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp19_) : NULL);
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->existing_categories_combo);
+ _g_object_unref0 (self->priv->strip_metadata_check);
#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->existing_categories_combo = _tmp20_;
+ self->priv->strip_metadata_check = _tmp25_;
#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = self->priv->builder;
+ _tmp26_ = self->priv->strip_metadata_check;
#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = gtk_builder_get_object (_tmp21_, "new_category_entry");
+ _tmp27_ = self->priv->_strip_metadata_enabled;
#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp22_) : NULL);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->new_category_entry);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->new_category_entry = _tmp23_;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = self->priv->builder;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp25_ = gtk_builder_get_object (_tmp24_, "within_existing_label");
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp25_) : NULL);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->within_existing_label);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->within_existing_label = _tmp26_;
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp27_);
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp27_ = self->priv->builder;
+ _tmp28_ = gtk_builder_get_object (builder, "title_as_comment_check");
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp28_ = gtk_builder_get_object (_tmp27_, "within_existing_combo");
+ _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp28_) : NULL);
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp28_) : NULL);
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->within_existing_combo);
+ _g_object_unref0 (self->priv->title_as_comment_check);
#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->within_existing_combo = _tmp29_;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp30_ = self->priv->builder;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp31_ = gtk_builder_get_object (_tmp30_, "album_comment");
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp31_) : NULL);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->album_comment);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->album_comment = _tmp32_;
+ self->priv->title_as_comment_check = _tmp29_;
+#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp30_ = self->priv->title_as_comment_check;
+#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp31_ = self->priv->_last_title_as_comment;
+#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp31_);
#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp33_ = self->priv->album_comment;
+ _tmp32_ = gtk_builder_get_object (builder, "no_upload_tags_check");
#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp34_ = gtk_text_buffer_new (NULL);
+ _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp32_) : NULL);
#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp35_ = _tmp34_;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_text_view_set_buffer (_tmp33_, _tmp35_);
+ _g_object_unref0 (self->priv->no_upload_tags_check);
#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (_tmp35_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp36_ = self->priv->builder;
+ self->priv->no_upload_tags_check = _tmp33_;
#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp37_ = gtk_builder_get_object (_tmp36_, "album_comment_label");
+ _tmp34_ = self->priv->no_upload_tags_check;
#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp37_) : NULL);
+ _tmp35_ = self->priv->_last_no_upload_tags;
#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->album_comment_label);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->album_comment_label = _tmp38_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp39_ = self->priv->builder;
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp35_);
#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp40_ = gtk_builder_get_object (_tmp39_, "perms_combo");
+ _tmp36_ = gtk_builder_get_object (builder, "logout_button");
#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp40_) : NULL);
+ _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, gtk_button_get_type ()) ? ((GtkButton*) _tmp36_) : NULL);
#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->perms_combo);
+ _g_object_unref0 (self->priv->logout_button);
#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->perms_combo = _tmp41_;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp42_ = self->priv->builder;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp43_ = gtk_builder_get_object (_tmp42_, "size_combo");
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp43_) : NULL);
+ self->priv->logout_button = _tmp37_;
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->size_combo);
+ _tmp38_ = self->priv->logout_button;
#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->size_combo = _tmp44_;
+ g_signal_connect_object (_tmp38_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = self->priv->builder;
+ _tmp39_ = gtk_builder_get_object (builder, "publish_button");
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = gtk_builder_get_object (_tmp45_, "strip_metadata_check");
+ _tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, gtk_button_get_type ()) ? ((GtkButton*) _tmp39_) : NULL);
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp46_) : NULL);
-#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->strip_metadata_check);
+ _g_object_unref0 (self->priv->publish_button);
#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->strip_metadata_check = _tmp47_;
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = self->priv->strip_metadata_check;
+ self->priv->publish_button = _tmp40_;
#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = strip_metadata_enabled;
+ _tmp41_ = self->priv->publish_button;
#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = self->priv->builder;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = gtk_builder_get_object (_tmp50_, "title_as_comment_check");
+ g_signal_connect_object (_tmp41_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp51_) : NULL);
+ _tmp42_ = self->priv->use_existing_radio;
#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->title_as_comment_check);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->title_as_comment_check = _tmp52_;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp53_ = self->priv->title_as_comment_check;
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp54_ = last_title_as_comment;
+ _tmp43_ = self->priv->create_new_radio;
#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp54_);
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp55_ = self->priv->builder;
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp56_ = gtk_builder_get_object (_tmp55_, "no_upload_tags_check");
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp44_ = self->priv->new_category_entry;
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp56_) : NULL);
+ _tmp45_ = self->priv->within_existing_combo;
#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->no_upload_tags_check);
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->no_upload_tags_check = _tmp57_;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp58_ = self->priv->no_upload_tags_check;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp59_ = last_no_upload_tags;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp59_);
+ g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed, self, 0);
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp47_ = publishing_piwigo_publishing_options_pane_create_perm_levels (self, &_tmp46_);
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->perm_levels = _tmp47_;
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->perm_levels_length1 = _tmp46_;
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_perm_levels_size_ = self->priv->perm_levels_length1;
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp60_ = self->priv->builder;
+ _tmp49_ = publishing_piwigo_publishing_options_pane_create_sizes (self, &_tmp48_);
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp61_ = gtk_builder_get_object (_tmp60_, "logout_button");
+ self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp61_, gtk_button_get_type ()) ? ((GtkButton*) _tmp61_) : NULL);
+ self->priv->photo_sizes = _tmp49_;
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->logout_button);
+ self->priv->photo_sizes_length1 = _tmp48_;
#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->logout_button = _tmp62_;
+ self->priv->_photo_sizes_size_ = self->priv->photo_sizes_length1;
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp63_ = self->priv->logout_button;
+ _tmp50_ = self->priv->album_comment;
#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp64_ = self->priv->builder;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp65_ = gtk_builder_get_object (_tmp64_, "publish_button");
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, gtk_button_get_type ()) ? ((GtkButton*) _tmp65_) : NULL);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->publish_button);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->publish_button = _tmp66_;
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp67_ = self->priv->publish_button;
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp68_ = self->priv->use_existing_radio;
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp69_ = self->priv->create_new_radio;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp70_ = self->priv->new_category_entry;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp71_ = self->priv->within_existing_combo;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed, self, 0);
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp72_ = align;
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp73_ = self->priv->pane_widget;
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget));
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp74_ = self->priv->pane_widget;
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp75_ = align;
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_box_set_child_packing (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (align);
-#line 8643 "PiwigoPublishing.c"
- }
- goto __finally46;
- __catch46_g_error:
- {
- GError* e = NULL;
- GError* _tmp76_ = NULL;
- const gchar* _tmp77_ = NULL;
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- e = _inner_error_;
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _inner_error_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp76_ = e;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp77_ = _tmp76_->message;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_warning ("PiwigoPublishing.vala:1297: Could not load UI: %s", _tmp77_);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_error_free0 (e);
-#line 8663 "PiwigoPublishing.c"
- }
- __finally46:
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_clear_error (&_inner_error_);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return NULL;
-#line 8674 "PiwigoPublishing.c"
- }
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp78_ = categories;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp78__length1 = categories_length1;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp79_ = (_tmp78_ != NULL) ? _vala_array_dup11 (_tmp78_, _tmp78__length1) : ((gpointer) _tmp78_);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp79__length1 = _tmp78__length1;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->existing_categories = (_vala_array_free (self->priv->existing_categories, self->priv->existing_categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->existing_categories = _tmp79_;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->existing_categories_length1 = _tmp79__length1;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_existing_categories_size_ = self->priv->existing_categories_length1;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp81_ = publishing_piwigo_publishing_options_pane_create_perm_levels (self, &_tmp80_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->perm_levels = _tmp81_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->perm_levels_length1 = _tmp80_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_perm_levels_size_ = self->priv->perm_levels_length1;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp83_ = publishing_piwigo_publishing_options_pane_create_sizes (self, &_tmp82_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->photo_sizes = _tmp83_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->photo_sizes_length1 = _tmp82_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->_photo_sizes_size_ = self->priv->photo_sizes_length1;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp84_ = self->priv->album_comment;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp85_ = gtk_text_view_get_buffer (_tmp84_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp86_ = _tmp85_;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp87_ = publisher;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp88_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (self, _tmp87_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp89_ = _tmp88_;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_text_buffer_set_text (_tmp86_, _tmp89_, -1);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp89_);
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return self;
-#line 8730 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
-#line 8737 "PiwigoPublishing.c"
-}
-
-
-GtkWidget* publishing_piwigo_publishing_options_pane_get_default_widget (PublishingPiwigoPublishingOptionsPane* self) {
- GtkWidget* result = NULL;
- GtkButton* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->publish_button;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 8755 "PiwigoPublishing.c"
+ _tmp51_ = gtk_text_view_get_buffer (_tmp50_);
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp52_ = _tmp51_;
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp53_ = self->priv->_default_comment;
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_text_buffer_set_text (_tmp52_, _tmp53_, -1);
+#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (builder);
+#line 8676 "PiwigoPublishing.c"
}
static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8766 "PiwigoPublishing.c"
+#line 8687 "PiwigoPublishing.c"
}
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8772 "PiwigoPublishing.c"
+#line 8693 "PiwigoPublishing.c"
}
static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8783 "PiwigoPublishing.c"
+#line 8704 "PiwigoPublishing.c"
}
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8789 "PiwigoPublishing.c"
+#line 8710 "PiwigoPublishing.c"
}
static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8800 "PiwigoPublishing.c"
+#line 8721 "PiwigoPublishing.c"
}
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8806 "PiwigoPublishing.c"
+#line 8727 "PiwigoPublishing.c"
}
static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8817 "PiwigoPublishing.c"
+#line 8738 "PiwigoPublishing.c"
}
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8823 "PiwigoPublishing.c"
+#line 8744 "PiwigoPublishing.c"
}
static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8834 "PiwigoPublishing.c"
+#line 8755 "PiwigoPublishing.c"
}
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8840 "PiwigoPublishing.c"
+#line 8761 "PiwigoPublishing.c"
}
@@ -8882,166 +8803,166 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
PublishingPiwigoPermissionLevel* _tmp15_ = NULL;
PublishingPiwigoPermissionLevel** _tmp16_ = NULL;
gint _tmp16__length1 = 0;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = g_new0 (PublishingPiwigoPermissionLevel*, 0 + 1);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = _tmp0_;
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result__length1 = 0;
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__result__size_ = _result__length1;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _result_;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1__length1 = _result__length1;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = _ ("Everyone");
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_permission_level_new (0, _tmp2_);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _result_;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4__length1 = _result__length1;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _ ("Admins, Family, Friends, Contacts");
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = publishing_piwigo_permission_level_new (1, _tmp5_);
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _result_;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7__length1 = _result__length1;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _ ("Admins, Family, Friends");
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = publishing_piwigo_permission_level_new (2, _tmp8_);
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = _result_;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10__length1 = _result__length1;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = _ ("Admins, Family");
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = publishing_piwigo_permission_level_new (4, _tmp11_);
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = _result_;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13__length1 = _result__length1;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = _ ("Admins");
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = publishing_piwigo_permission_level_new (8, _tmp14_);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = _result_;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16__length1 = _result__length1;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (result_length1) {
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*result_length1 = _tmp16__length1;
-#line 8940 "PiwigoPublishing.c"
+#line 8861 "PiwigoPublishing.c"
}
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp16_;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 8946 "PiwigoPublishing.c"
+#line 8867 "PiwigoPublishing.c"
}
static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8957 "PiwigoPublishing.c"
+#line 8878 "PiwigoPublishing.c"
}
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8963 "PiwigoPublishing.c"
+#line 8884 "PiwigoPublishing.c"
}
static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8974 "PiwigoPublishing.c"
+#line 8895 "PiwigoPublishing.c"
}
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8980 "PiwigoPublishing.c"
+#line 8901 "PiwigoPublishing.c"
}
static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8991 "PiwigoPublishing.c"
+#line 8912 "PiwigoPublishing.c"
}
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 8997 "PiwigoPublishing.c"
+#line 8918 "PiwigoPublishing.c"
}
static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 9008 "PiwigoPublishing.c"
+#line 8929 "PiwigoPublishing.c"
}
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 9014 "PiwigoPublishing.c"
+#line 8935 "PiwigoPublishing.c"
}
static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if ((*length) == (*size)) {
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 9025 "PiwigoPublishing.c"
+#line 8946 "PiwigoPublishing.c"
}
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[(*length)++] = value;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
(*array)[*length] = NULL;
-#line 9031 "PiwigoPublishing.c"
+#line 8952 "PiwigoPublishing.c"
}
@@ -9073,104 +8994,104 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
PublishingPiwigoSizeEntry* _tmp15_ = NULL;
PublishingPiwigoSizeEntry** _tmp16_ = NULL;
gint _tmp16__length1 = 0;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = g_new0 (PublishingPiwigoSizeEntry*, 0 + 1);
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = _tmp0_;
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result__length1 = 0;
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
__result__size_ = _result__length1;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _result_;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1__length1 = _result__length1;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = _ ("500 × 375 pixels");
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_size_entry_new (500, _tmp2_);
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _result_;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4__length1 = _result__length1;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _ ("1024 × 768 pixels");
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = publishing_piwigo_size_entry_new (1024, _tmp5_);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _result_;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7__length1 = _result__length1;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _ ("2048 × 1536 pixels");
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = publishing_piwigo_size_entry_new (2048, _tmp8_);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = _result_;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10__length1 = _result__length1;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = _ ("4096 × 3072 pixels");
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = publishing_piwigo_size_entry_new (4096, _tmp11_);
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = _result_;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13__length1 = _result__length1;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = _ ("Original size");
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _tmp14_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = _result_;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16__length1 = _result__length1;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (result_length1) {
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
*result_length1 = _tmp16__length1;
-#line 9131 "PiwigoPublishing.c"
+#line 9052 "PiwigoPublishing.c"
}
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp16_;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 9137 "PiwigoPublishing.c"
+#line 9058 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_emit_by_name (self, "logout");
-#line 9146 "PiwigoPublishing.c"
+#line 9067 "PiwigoPublishing.c"
}
static gpointer _publishing_piwigo_permission_level_ref0 (gpointer self) {
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_piwigo_permission_level_ref (self) : NULL;
-#line 9153 "PiwigoPublishing.c"
+#line 9074 "PiwigoPublishing.c"
}
static gpointer _publishing_piwigo_size_entry_ref0 (gpointer self) {
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_piwigo_size_entry_ref (self) : NULL;
-#line 9160 "PiwigoPublishing.c"
+#line 9081 "PiwigoPublishing.c"
}
@@ -9202,71 +9123,71 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
PublishingPiwigoPublishingParameters* _tmp53_ = NULL;
GtkCheckButton* _tmp54_ = NULL;
gboolean _tmp55_ = FALSE;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = publishing_piwigo_publishing_parameters_new ();
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
params = _tmp0_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = params;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->perm_levels;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2__length1 = self->priv->perm_levels_length1;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->perms_combo;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _tmp2_[_tmp4_];
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _publishing_piwigo_permission_level_ref0 (_tmp5_);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_permission_level_unref0 (_tmp1_->perm_level);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_->perm_level = _tmp6_;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = params;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = self->priv->photo_sizes;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8__length1 = self->priv->photo_sizes_length1;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = self->priv->size_combo;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = _tmp8_[_tmp10_];
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = _publishing_piwigo_size_entry_ref0 (_tmp11_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_size_entry_unref0 (_tmp7_->photo_size);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_->photo_size = _tmp12_;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = params;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = self->priv->title_as_comment_check;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_->title_as_comment = _tmp15_;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = params;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = self->priv->no_upload_tags_check;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_->no_upload_tags = _tmp18_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = self->priv->create_new_radio;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp20_) {
-#line 9256 "PiwigoPublishing.c"
+#line 9177 "PiwigoPublishing.c"
gchar* uploadcomment = NULL;
GtkTextView* _tmp21_ = NULL;
GtkTextBuffer* _tmp22_ = NULL;
@@ -9280,141 +9201,137 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
GtkComboBoxText* _tmp29_ = NULL;
gint _tmp30_ = 0;
gint _tmp31_ = 0;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = self->priv->album_comment;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp22_ = gtk_text_view_get_buffer (_tmp21_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = _tmp22_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_object_get (_tmp23_, "text", &_tmp24_, NULL);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp25_ = _tmp24_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp26_ = _tmp25_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp27_ = string_strip (_tmp26_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp28_ = _tmp27_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp26_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
uploadcomment = _tmp28_;
-#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp29_ = self->priv->within_existing_combo;
-#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp30_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
a = _tmp30_;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp31_ = a;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp31_ == 0) {
-#line 9300 "PiwigoPublishing.c"
+#line 9221 "PiwigoPublishing.c"
PublishingPiwigoPublishingParameters* _tmp32_ = NULL;
GtkEntry* _tmp33_ = NULL;
const gchar* _tmp34_ = NULL;
const gchar* _tmp35_ = NULL;
PublishingPiwigoCategory* _tmp36_ = NULL;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp32_ = params;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp33_ = self->priv->new_category_entry;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp34_ = gtk_entry_get_text (_tmp33_);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp35_ = uploadcomment;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp36_ = publishing_piwigo_category_new_local (_tmp34_, 0, _tmp35_);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (_tmp32_->category);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp32_->category = _tmp36_;
-#line 9320 "PiwigoPublishing.c"
+#line 9241 "PiwigoPublishing.c"
} else {
gint _tmp37_ = 0;
PublishingPiwigoPublishingParameters* _tmp38_ = NULL;
GtkEntry* _tmp39_ = NULL;
const gchar* _tmp40_ = NULL;
- PublishingPiwigoCategory** _tmp41_ = NULL;
- gint _tmp41__length1 = 0;
+ GeeList* _tmp41_ = NULL;
gint _tmp42_ = 0;
- PublishingPiwigoCategory* _tmp43_ = NULL;
- gint _tmp44_ = 0;
- const gchar* _tmp45_ = NULL;
- PublishingPiwigoCategory* _tmp46_ = NULL;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gpointer _tmp43_ = NULL;
+ PublishingPiwigoCategory* _tmp44_ = NULL;
+ gint _tmp45_ = 0;
+ const gchar* _tmp46_ = NULL;
+ PublishingPiwigoCategory* _tmp47_ = NULL;
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp37_ = a;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
a = _tmp37_ - 1;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp38_ = params;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp39_ = self->priv->new_category_entry;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp40_ = gtk_entry_get_text (_tmp39_);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41_ = self->priv->existing_categories;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp41__length1 = self->priv->existing_categories_length1;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp41_ = self->priv->_existing_categories;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp42_ = a;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp43_ = _tmp41_[_tmp42_];
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp44_ = _tmp43_->id;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp45_ = uploadcomment;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp46_ = publishing_piwigo_category_new_local (_tmp40_, _tmp44_, _tmp45_);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp43_ = gee_list_get (_tmp41_, _tmp42_);
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp44_ = (PublishingPiwigoCategory*) _tmp43_;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp45_ = _tmp44_->id;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp46_ = uploadcomment;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp47_ = publishing_piwigo_category_new_local (_tmp40_, _tmp45_, _tmp46_);
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (_tmp38_->category);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp38_->category = _tmp46_;
-#line 9361 "PiwigoPublishing.c"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp38_->category = _tmp47_;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _publishing_piwigo_category_unref0 (_tmp44_);
+#line 9284 "PiwigoPublishing.c"
}
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (uploadcomment);
-#line 9365 "PiwigoPublishing.c"
+#line 9288 "PiwigoPublishing.c"
} else {
- PublishingPiwigoPublishingParameters* _tmp47_ = NULL;
- PublishingPiwigoCategory** _tmp48_ = NULL;
- gint _tmp48__length1 = 0;
- GtkComboBoxText* _tmp49_ = NULL;
- gint _tmp50_ = 0;
- PublishingPiwigoCategory* _tmp51_ = NULL;
- PublishingPiwigoCategory* _tmp52_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_ = params;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48_ = self->priv->existing_categories;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp48__length1 = self->priv->existing_categories_length1;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp49_ = self->priv->existing_categories_combo;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp50_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp51_ = _tmp48_[_tmp50_];
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp52_ = _publishing_piwigo_category_ref0 (_tmp51_);
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (_tmp47_->category);
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp47_->category = _tmp52_;
-#line 9392 "PiwigoPublishing.c"
+ PublishingPiwigoPublishingParameters* _tmp48_ = NULL;
+ GeeList* _tmp49_ = NULL;
+ GtkComboBoxText* _tmp50_ = NULL;
+ gint _tmp51_ = 0;
+ gpointer _tmp52_ = NULL;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp48_ = params;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp49_ = self->priv->_existing_categories;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp50_ = self->priv->existing_categories_combo;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp51_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox));
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp52_ = gee_list_get (_tmp49_, _tmp51_);
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _publishing_piwigo_category_unref0 (_tmp48_->category);
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp48_->category = (PublishingPiwigoCategory*) _tmp52_;
+#line 9309 "PiwigoPublishing.c"
}
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp53_ = params;
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp54_ = self->priv->strip_metadata_check;
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp55_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_emit_by_name (self, "publish", _tmp53_, _tmp55_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (params);
-#line 9404 "PiwigoPublishing.c"
+#line 9321 "PiwigoPublishing.c"
}
@@ -9426,39 +9343,39 @@ static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clic
GtkComboBoxText* _tmp4_ = NULL;
GtkLabel* _tmp5_ = NULL;
GtkTextView* _tmp6_ = NULL;
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->existing_categories_combo;
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->new_category_entry;
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->within_existing_label;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->within_existing_combo;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->existing_categories_combo;
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = self->priv->album_comment_label;
-#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = self->priv->album_comment;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9448 "PiwigoPublishing.c"
+#line 9365 "PiwigoPublishing.c"
}
@@ -9470,57 +9387,57 @@ static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicke
GtkTextView* _tmp4_ = NULL;
GtkComboBoxText* _tmp5_ = NULL;
GtkEntry* _tmp6_ = NULL;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->new_category_entry;
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = self->priv->within_existing_label;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->within_existing_combo;
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->album_comment_label;
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->album_comment;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = self->priv->existing_categories_combo;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = self->priv->new_category_entry;
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9492 "PiwigoPublishing.c"
+#line 9409 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9501 "PiwigoPublishing.c"
+#line 9418 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9510 "PiwigoPublishing.c"
+#line 9427 "PiwigoPublishing.c"
}
@@ -9534,186 +9451,158 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
gint _tmp4_ = 0;
gchar* search_name = NULL;
gint _tmp5_ = 0;
- gboolean _tmp17_ = FALSE;
- GtkRadioButton* _tmp18_ = NULL;
- gboolean _tmp19_ = FALSE;
- GtkButton* _tmp24_ = NULL;
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gboolean _tmp18_ = FALSE;
+ GtkRadioButton* _tmp19_ = NULL;
+ gboolean _tmp20_ = FALSE;
+ GtkButton* _tmp25_ = NULL;
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->new_category_entry;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = string_strip (_tmp1_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
category_name = _tmp2_;
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->within_existing_combo;
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
a = _tmp4_;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = a;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp5_ <= 0) {
-#line 9548 "PiwigoPublishing.c"
+#line 9465 "PiwigoPublishing.c"
const gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = category_name;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = g_strconcat ("/ ", _tmp6_, NULL);
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (search_name);
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
search_name = _tmp7_;
-#line 9559 "PiwigoPublishing.c"
+#line 9476 "PiwigoPublishing.c"
} else {
gint _tmp8_ = 0;
- PublishingPiwigoCategory** _tmp9_ = NULL;
- gint _tmp9__length1 = 0;
+ GeeList* _tmp9_ = NULL;
gint _tmp10_ = 0;
- PublishingPiwigoCategory* _tmp11_ = NULL;
- const gchar* _tmp12_ = NULL;
- gchar* _tmp13_ = NULL;
+ gpointer _tmp11_ = NULL;
+ PublishingPiwigoCategory* _tmp12_ = NULL;
+ const gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
- gchar* _tmp16_ = NULL;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gchar* _tmp15_ = NULL;
+ const gchar* _tmp16_ = NULL;
+ gchar* _tmp17_ = NULL;
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = a;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
a = _tmp8_ - 1;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = self->priv->existing_categories;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9__length1 = self->priv->existing_categories_length1;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = self->priv->_existing_categories;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = a;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = _tmp9_[_tmp10_];
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = _tmp11_->display_name;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = g_strconcat (_tmp12_, "/ ", NULL);
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = _tmp13_;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = category_name;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = g_strconcat (_tmp14_, _tmp15_, NULL);
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = (PublishingPiwigoCategory*) _tmp11_;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = _tmp12_->display_name;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp14_ = g_strconcat (_tmp13_, "/ ", NULL);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp15_ = _tmp14_;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp16_ = category_name;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp17_ = g_strconcat (_tmp15_, _tmp16_, NULL);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (search_name);
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- search_name = _tmp16_;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp14_);
-#line 9599 "PiwigoPublishing.c"
- }
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = self->priv->create_new_radio;
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp19_) {
-#line 9607 "PiwigoPublishing.c"
- gboolean _tmp20_ = FALSE;
- const gchar* _tmp21_ = NULL;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = category_name;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (g_strcmp0 (_tmp21_, "") == 0) {
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = TRUE;
-#line 9616 "PiwigoPublishing.c"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ search_name = _tmp17_;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp15_);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _publishing_piwigo_category_unref0 (_tmp12_);
+#line 9518 "PiwigoPublishing.c"
+ }
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp19_ = self->priv->create_new_radio;
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (_tmp20_) {
+#line 9526 "PiwigoPublishing.c"
+ gboolean _tmp21_ = FALSE;
+ const gchar* _tmp22_ = NULL;
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp22_ = category_name;
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (g_strcmp0 (_tmp22_, "") == 0) {
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp21_ = TRUE;
+#line 9535 "PiwigoPublishing.c"
} else {
- const gchar* _tmp22_ = NULL;
- gboolean _tmp23_ = FALSE;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = search_name;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp22_);
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = _tmp23_;
-#line 9626 "PiwigoPublishing.c"
+ const gchar* _tmp23_ = NULL;
+ gboolean _tmp24_ = FALSE;
+#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp23_ = search_name;
+#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp24_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp23_);
+#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp21_ = _tmp24_;
+#line 9545 "PiwigoPublishing.c"
}
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = _tmp20_;
-#line 9630 "PiwigoPublishing.c"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp18_ = _tmp21_;
+#line 9549 "PiwigoPublishing.c"
} else {
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = FALSE;
-#line 9634 "PiwigoPublishing.c"
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp18_ = FALSE;
+#line 9553 "PiwigoPublishing.c"
}
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = self->priv->publish_button;
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), !_tmp17_);
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp25_ = self->priv->publish_button;
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), !_tmp18_);
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (search_name);
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (category_name);
-#line 9644 "PiwigoPublishing.c"
-}
-
-
-static GtkWidget* publishing_piwigo_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
- PublishingPiwigoPublishingOptionsPane * self;
- GtkWidget* result = NULL;
- GtkBox* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
-#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = _tmp1_;
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 9663 "PiwigoPublishing.c"
+#line 9563 "PiwigoPublishing.c"
}
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
- PublishingPiwigoPublishingOptionsPane * self;
- SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- return result;
-#line 9676 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
PublishingPiwigoPublishingOptionsPane * self;
GtkButton* _tmp0_ = NULL;
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->on_pane_installed (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_create_categories_combo (self);
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_create_within_categories_combo (self);
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_create_permissions_combo (self);
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_create_size_combo (self);
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->publish_button;
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9699 "PiwigoPublishing.c"
+#line 9588 "PiwigoPublishing.c"
}
-static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPublishingOptionsPane* self, PublishingPiwigoPiwigoPublisher* publisher) {
+static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher) {
gchar* result = NULL;
SpitPublishingPublishable** publishables = NULL;
PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
@@ -9731,388 +9620,440 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
SpitPublishingPublishable** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
const gchar* _tmp19_ = NULL;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = publisher;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = publishing_piwigo_piwigo_publisher_get_host (_tmp0_);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = _tmp1_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = spit_publishing_plugin_host_get_publishables (_tmp2_, &_tmp3_);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _tmp4_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5__length1 = _tmp3_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_tmp2_);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables = _tmp5_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables_length1 = _tmp5__length1;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishables_size_ = publishables_length1;
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = g_strdup ("");
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
common = _tmp6_;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
isfirst = TRUE;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = publishables;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7__length1 = publishables_length1;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ != NULL) {
-#line 9757 "PiwigoPublishing.c"
+#line 9644 "PiwigoPublishing.c"
SpitPublishingPublishable** _tmp8_ = NULL;
gint _tmp8__length1 = 0;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = publishables;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8__length1 = publishables_length1;
-#line 9764 "PiwigoPublishing.c"
+#line 9651 "PiwigoPublishing.c"
{
SpitPublishingPublishable** pub_collection = NULL;
gint pub_collection_length1 = 0;
gint _pub_collection_size_ = 0;
gint pub_it = 0;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pub_collection = _tmp8_;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pub_collection_length1 = _tmp8__length1;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (pub_it = 0; pub_it < _tmp8__length1; pub_it = pub_it + 1) {
-#line 9776 "PiwigoPublishing.c"
+#line 9663 "PiwigoPublishing.c"
SpitPublishingPublishable* _tmp9_ = NULL;
SpitPublishingPublishable* pub = NULL;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = _g_object_ref0 (pub_collection[pub_it]);
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
pub = _tmp9_;
-#line 9783 "PiwigoPublishing.c"
+#line 9670 "PiwigoPublishing.c"
{
gchar* cur = NULL;
SpitPublishingPublishable* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
gboolean _tmp13_ = FALSE;
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = pub;
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = spit_publishing_publishable_get_param_string (_tmp10_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT);
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
cur = _tmp11_;
-#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = cur;
-#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp12_ == NULL) {
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (cur);
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (pub);
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
continue;
-#line 9806 "PiwigoPublishing.c"
+#line 9693 "PiwigoPublishing.c"
}
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = isfirst;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp13_) {
-#line 9812 "PiwigoPublishing.c"
+#line 9699 "PiwigoPublishing.c"
const gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = cur;
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = g_strdup (_tmp14_);
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (common);
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
common = _tmp15_;
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
isfirst = FALSE;
-#line 9825 "PiwigoPublishing.c"
+#line 9712 "PiwigoPublishing.c"
} else {
const gchar* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = cur;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = common;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (_tmp16_, _tmp17_) != 0) {
-#line 9835 "PiwigoPublishing.c"
+#line 9722 "PiwigoPublishing.c"
gchar* _tmp18_ = NULL;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = g_strdup ("");
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (common);
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
common = _tmp18_;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (cur);
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (pub);
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 9849 "PiwigoPublishing.c"
+#line 9736 "PiwigoPublishing.c"
}
}
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (cur);
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (pub);
-#line 9856 "PiwigoPublishing.c"
+#line 9743 "PiwigoPublishing.c"
}
}
}
}
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = common;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:1457: PiwigoConnector: found common event commen" \
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:1428: PiwigoConnector: found common event commen" \
"t %s\n", _tmp19_);
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = common;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 9871 "PiwigoPublishing.c"
+#line 9758 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
- PublishingPiwigoCategory** _tmp0_ = NULL;
- gint _tmp0__length1 = 0;
- PublishingPiwigoCategory** _tmp5_ = NULL;
- gint _tmp5__length1 = 0;
- const gchar* _tmp21_ = NULL;
- gboolean _tmp22_ = FALSE;
-#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ GeeList* _tmp14_ = NULL;
+ gboolean _tmp15_ = FALSE;
+ gboolean _tmp16_ = FALSE;
+ const gchar* _tmp30_ = NULL;
+ gboolean _tmp31_ = FALSE;
+#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->existing_categories;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0__length1 = self->priv->existing_categories_length1;
-#line 9888 "PiwigoPublishing.c"
+#line 9770 "PiwigoPublishing.c"
{
- PublishingPiwigoCategory** cat_collection = NULL;
- gint cat_collection_length1 = 0;
- gint _cat_collection_size_ = 0;
- gint cat_it = 0;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cat_collection = _tmp0_;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cat_collection_length1 = _tmp0__length1;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- for (cat_it = 0; cat_it < _tmp0__length1; cat_it = cat_it + 1) {
-#line 9900 "PiwigoPublishing.c"
- PublishingPiwigoCategory* _tmp1_ = NULL;
+ GeeList* _cat_list = NULL;
+ GeeList* _tmp0_ = NULL;
+ GeeList* _tmp1_ = NULL;
+ gint _cat_size = 0;
+ GeeList* _tmp2_ = NULL;
+ gint _tmp3_ = 0;
+ gint _tmp4_ = 0;
+ gint _cat_index = 0;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_existing_categories;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_list = _tmp1_;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp2_ = _cat_list;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp4_ = _tmp3_;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_size = _tmp4_;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_index = -1;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ while (TRUE) {
+#line 9798 "PiwigoPublishing.c"
+ gint _tmp5_ = 0;
+ gint _tmp6_ = 0;
+ gint _tmp7_ = 0;
PublishingPiwigoCategory* cat = NULL;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]);
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cat = _tmp1_;
-#line 9907 "PiwigoPublishing.c"
- {
- GtkComboBoxText* _tmp2_ = NULL;
- PublishingPiwigoCategory* _tmp3_ = NULL;
- const gchar* _tmp4_ = NULL;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = self->priv->existing_categories_combo;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = cat;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = _tmp3_->display_name;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (cat);
-#line 9922 "PiwigoPublishing.c"
+ GeeList* _tmp8_ = NULL;
+ gint _tmp9_ = 0;
+ gpointer _tmp10_ = NULL;
+ GtkComboBoxText* _tmp11_ = NULL;
+ PublishingPiwigoCategory* _tmp12_ = NULL;
+ const gchar* _tmp13_ = NULL;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = _cat_index;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_index = _tmp5_ + 1;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6_ = _cat_index;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = _cat_size;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!(_tmp6_ < _tmp7_)) {
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 9821 "PiwigoPublishing.c"
}
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = _cat_list;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = _cat_index;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = gee_list_get (_tmp8_, _tmp9_);
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ cat = (PublishingPiwigoCategory*) _tmp10_;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = self->priv->existing_categories_combo;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = cat;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = _tmp12_->display_name;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_combo_box_text_append_text (_tmp11_, _tmp13_);
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _publishing_piwigo_category_unref0 (cat);
+#line 9841 "PiwigoPublishing.c"
}
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_cat_list);
+#line 9845 "PiwigoPublishing.c"
}
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = self->priv->existing_categories;
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5__length1 = self->priv->existing_categories_length1;
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp5__length1 == 0) {
-#line 9932 "PiwigoPublishing.c"
- GtkComboBoxText* _tmp6_ = NULL;
- GtkRadioButton* _tmp7_ = NULL;
- GtkRadioButton* _tmp8_ = NULL;
- GtkTextView* _tmp9_ = NULL;
- GtkLabel* _tmp10_ = NULL;
- GtkEntry* _tmp11_ = NULL;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = self->priv->existing_categories_combo;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = self->priv->use_existing_radio;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->create_new_radio;
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = self->priv->album_comment;
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp10_ = self->priv->album_comment_label;
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp11_ = self->priv->new_category_entry;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 9963 "PiwigoPublishing.c"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp14_ = self->priv->_existing_categories;
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp15_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp16_ = _tmp15_;
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (_tmp16_) {
+#line 9855 "PiwigoPublishing.c"
+ GtkComboBoxText* _tmp17_ = NULL;
+ GtkRadioButton* _tmp18_ = NULL;
+ GtkRadioButton* _tmp19_ = NULL;
+ GtkTextView* _tmp20_ = NULL;
+ GtkLabel* _tmp21_ = NULL;
+ GtkEntry* _tmp22_ = NULL;
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp17_ = self->priv->existing_categories_combo;
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp18_ = self->priv->use_existing_radio;
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp19_ = self->priv->create_new_radio;
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp20_ = self->priv->album_comment;
+#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp21_ = self->priv->album_comment_label;
+#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp22_ = self->priv->new_category_entry;
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
+#line 9886 "PiwigoPublishing.c"
} else {
gint last_category_index = 0;
- gint _tmp12_ = 0;
- gint _tmp13_ = 0;
- gint _tmp14_ = 0;
- GtkEntry* _tmp18_ = NULL;
- GtkTextView* _tmp19_ = NULL;
- GtkLabel* _tmp20_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp12_ = self->priv->last_category;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp13_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp12_);
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- last_category_index = _tmp13_;
-#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp14_ = last_category_index;
-#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp14_ < 0) {
-#line 9982 "PiwigoPublishing.c"
- GtkComboBoxText* _tmp15_ = NULL;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp15_ = self->priv->existing_categories_combo;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 9988 "PiwigoPublishing.c"
- } else {
- GtkComboBoxText* _tmp16_ = NULL;
- gint _tmp17_ = 0;
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp16_ = self->priv->existing_categories_combo;
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp17_ = last_category_index;
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _tmp17_);
-#line 9998 "PiwigoPublishing.c"
- }
-#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp18_ = self->priv->new_category_entry;
-#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp19_ = self->priv->album_comment;
-#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp20_ = self->priv->album_comment_label;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10012 "PiwigoPublishing.c"
+ gint _tmp23_ = 0;
+ gint _tmp24_ = 0;
+ GtkComboBoxText* _tmp25_ = NULL;
+ gint _tmp26_ = 0;
+ GtkEntry* _tmp27_ = NULL;
+ GtkTextView* _tmp28_ = NULL;
+ GtkLabel* _tmp29_ = NULL;
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp23_ = self->priv->_last_category;
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp24_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp23_);
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ last_category_index = _tmp24_;
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp25_ = self->priv->existing_categories_combo;
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp26_ = last_category_index;
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp27_ = self->priv->new_category_entry;
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp28_ = self->priv->album_comment;
+#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp29_ = self->priv->album_comment_label;
+#line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 9920 "PiwigoPublishing.c"
}
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp21_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp22_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp21_);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!_tmp22_) {
-#line 10020 "PiwigoPublishing.c"
- GtkEntry* _tmp23_ = NULL;
- const gchar* _tmp24_ = NULL;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp23_ = self->priv->new_category_entry;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp24_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_entry_set_text (_tmp23_, _tmp24_);
-#line 10029 "PiwigoPublishing.c"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp30_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp31_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp30_);
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!_tmp31_) {
+#line 9928 "PiwigoPublishing.c"
+ GtkEntry* _tmp32_ = NULL;
+ const gchar* _tmp33_ = NULL;
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp32_ = self->priv->new_category_entry;
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp33_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_entry_set_text (_tmp32_, _tmp33_);
+#line 9937 "PiwigoPublishing.c"
}
}
static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
GtkComboBoxText* _tmp0_ = NULL;
- PublishingPiwigoCategory** _tmp1_ = NULL;
- gint _tmp1__length1 = 0;
- GtkLabel* _tmp6_ = NULL;
- GtkComboBoxText* _tmp7_ = NULL;
- GtkComboBoxText* _tmp8_ = NULL;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ GtkLabel* _tmp15_ = NULL;
+ GtkComboBoxText* _tmp16_ = NULL;
+ GtkComboBoxText* _tmp17_ = NULL;
+#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->within_existing_combo;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_text_append_text (_tmp0_, "/ ");
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = self->priv->existing_categories;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1__length1 = self->priv->existing_categories_length1;
-#line 10051 "PiwigoPublishing.c"
+#line 9953 "PiwigoPublishing.c"
{
- PublishingPiwigoCategory** cat_collection = NULL;
- gint cat_collection_length1 = 0;
- gint _cat_collection_size_ = 0;
- gint cat_it = 0;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cat_collection = _tmp1_;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cat_collection_length1 = _tmp1__length1;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- for (cat_it = 0; cat_it < _tmp1__length1; cat_it = cat_it + 1) {
-#line 10063 "PiwigoPublishing.c"
- PublishingPiwigoCategory* _tmp2_ = NULL;
+ GeeList* _cat_list = NULL;
+ GeeList* _tmp1_ = NULL;
+ GeeList* _tmp2_ = NULL;
+ gint _cat_size = 0;
+ GeeList* _tmp3_ = NULL;
+ gint _tmp4_ = 0;
+ gint _tmp5_ = 0;
+ gint _cat_index = 0;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = self->priv->_existing_categories;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp2_ = _g_object_ref0 (_tmp1_);
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_list = _tmp2_;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = _cat_list;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = _tmp4_;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_size = _tmp5_;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_index = -1;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ while (TRUE) {
+#line 9981 "PiwigoPublishing.c"
+ gint _tmp6_ = 0;
+ gint _tmp7_ = 0;
+ gint _tmp8_ = 0;
PublishingPiwigoCategory* cat = NULL;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]);
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- cat = _tmp2_;
-#line 10070 "PiwigoPublishing.c"
- {
- GtkComboBoxText* _tmp3_ = NULL;
- PublishingPiwigoCategory* _tmp4_ = NULL;
- const gchar* _tmp5_ = NULL;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = self->priv->within_existing_combo;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = cat;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = _tmp4_->display_name;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (cat);
-#line 10085 "PiwigoPublishing.c"
+ GeeList* _tmp9_ = NULL;
+ gint _tmp10_ = 0;
+ gpointer _tmp11_ = NULL;
+ GtkComboBoxText* _tmp12_ = NULL;
+ PublishingPiwigoCategory* _tmp13_ = NULL;
+ const gchar* _tmp14_ = NULL;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6_ = _cat_index;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _cat_index = _tmp6_ + 1;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = _cat_index;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = _cat_size;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!(_tmp7_ < _tmp8_)) {
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 10004 "PiwigoPublishing.c"
}
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = _cat_list;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = _cat_index;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ cat = (PublishingPiwigoCategory*) _tmp11_;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = self->priv->within_existing_combo;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = cat;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp14_ = _tmp13_->display_name;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_combo_box_text_append_text (_tmp12_, _tmp14_);
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _publishing_piwigo_category_unref0 (cat);
+#line 10024 "PiwigoPublishing.c"
}
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_cat_list);
+#line 10028 "PiwigoPublishing.c"
}
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = self->priv->within_existing_label;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = self->priv->within_existing_combo;
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = self->priv->within_existing_combo;
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10101 "PiwigoPublishing.c"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp15_ = self->priv->within_existing_label;
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp16_ = self->priv->within_existing_combo;
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp17_ = self->priv->within_existing_combo;
+#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 10042 "PiwigoPublishing.c"
}
@@ -10123,77 +10064,77 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
gint _tmp5_ = 0;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->perm_levels;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0__length1 = self->priv->perm_levels_length1;
-#line 10118 "PiwigoPublishing.c"
+#line 10059 "PiwigoPublishing.c"
{
PublishingPiwigoPermissionLevel** perm_collection = NULL;
gint perm_collection_length1 = 0;
gint _perm_collection_size_ = 0;
gint perm_it = 0;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
perm_collection = _tmp0_;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
perm_collection_length1 = _tmp0__length1;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) {
-#line 10130 "PiwigoPublishing.c"
+#line 10071 "PiwigoPublishing.c"
PublishingPiwigoPermissionLevel* _tmp1_ = NULL;
PublishingPiwigoPermissionLevel* perm = NULL;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
perm = _tmp1_;
-#line 10137 "PiwigoPublishing.c"
+#line 10078 "PiwigoPublishing.c"
{
GtkComboBoxText* _tmp2_ = NULL;
PublishingPiwigoPermissionLevel* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->perms_combo;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = perm;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_->name;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_permission_level_unref0 (perm);
-#line 10152 "PiwigoPublishing.c"
+#line 10093 "PiwigoPublishing.c"
}
}
}
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = self->priv->last_permission_level;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = self->priv->_last_permission_level;
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_);
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
last_permission_level_index = _tmp6_;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = last_permission_level_index;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ < 0) {
-#line 10166 "PiwigoPublishing.c"
+#line 10107 "PiwigoPublishing.c"
GtkComboBoxText* _tmp8_ = NULL;
-#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = self->priv->perms_combo;
-#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 10172 "PiwigoPublishing.c"
+#line 10113 "PiwigoPublishing.c"
} else {
GtkComboBoxText* _tmp9_ = NULL;
gint _tmp10_ = 0;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = self->priv->perms_combo;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = last_permission_level_index;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 10182 "PiwigoPublishing.c"
+#line 10123 "PiwigoPublishing.c"
}
}
@@ -10205,200 +10146,200 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
gint _tmp5_ = 0;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->photo_sizes;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0__length1 = self->priv->photo_sizes_length1;
-#line 10200 "PiwigoPublishing.c"
+#line 10141 "PiwigoPublishing.c"
{
PublishingPiwigoSizeEntry** size_collection = NULL;
gint size_collection_length1 = 0;
gint _size_collection_size_ = 0;
gint size_it = 0;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
size_collection = _tmp0_;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
size_collection_length1 = _tmp0__length1;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) {
-#line 10212 "PiwigoPublishing.c"
+#line 10153 "PiwigoPublishing.c"
PublishingPiwigoSizeEntry* _tmp1_ = NULL;
PublishingPiwigoSizeEntry* size = NULL;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]);
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
size = _tmp1_;
-#line 10219 "PiwigoPublishing.c"
+#line 10160 "PiwigoPublishing.c"
{
GtkComboBoxText* _tmp2_ = NULL;
PublishingPiwigoSizeEntry* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->size_combo;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = size;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_->name;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_size_entry_unref0 (size);
-#line 10234 "PiwigoPublishing.c"
+#line 10175 "PiwigoPublishing.c"
}
}
}
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = self->priv->last_photo_size;
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = self->priv->_last_photo_size;
+#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_);
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
last_size_index = _tmp6_;
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = last_size_index;
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ < 0) {
-#line 10248 "PiwigoPublishing.c"
+#line 10189 "PiwigoPublishing.c"
GtkComboBoxText* _tmp8_ = NULL;
gint _tmp9_ = 0;
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = self->priv->size_combo;
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
-#line 10257 "PiwigoPublishing.c"
+#line 10198 "PiwigoPublishing.c"
} else {
GtkComboBoxText* _tmp10_ = NULL;
gint _tmp11_ = 0;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = self->priv->size_combo;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = last_size_index;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_);
-#line 10267 "PiwigoPublishing.c"
+#line 10208 "PiwigoPublishing.c"
}
}
-static void publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
- PublishingPiwigoPublishingOptionsPane * self;
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 10276 "PiwigoPublishing.c"
-}
-
-
static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id) {
gint result = 0;
gint _result_ = 0;
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _result_ = -1;
-#line 10287 "PiwigoPublishing.c"
+#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _result_ = 0;
+#line 10220 "PiwigoPublishing.c"
{
gint i = 0;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 10292 "PiwigoPublishing.c"
+#line 10225 "PiwigoPublishing.c"
{
gboolean _tmp0_ = FALSE;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = TRUE;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 10299 "PiwigoPublishing.c"
+#line 10232 "PiwigoPublishing.c"
gint _tmp2_ = 0;
- PublishingPiwigoCategory** _tmp3_ = NULL;
- gint _tmp3__length1 = 0;
- PublishingPiwigoCategory** _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
+ GeeList* _tmp3_ = NULL;
+ gint _tmp4_ = 0;
gint _tmp5_ = 0;
- PublishingPiwigoCategory* _tmp6_ = NULL;
+ GeeList* _tmp6_ = NULL;
gint _tmp7_ = 0;
- gint _tmp8_ = 0;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ gpointer _tmp8_ = NULL;
+ PublishingPiwigoCategory* _tmp9_ = NULL;
+ gint _tmp10_ = 0;
+ gint _tmp11_ = 0;
+ gboolean _tmp12_ = FALSE;
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 10311 "PiwigoPublishing.c"
+#line 10246 "PiwigoPublishing.c"
gint _tmp1_ = 0;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = i;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = _tmp1_ + 1;
-#line 10317 "PiwigoPublishing.c"
+#line 10252 "PiwigoPublishing.c"
}
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = i;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = self->priv->existing_categories;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3__length1 = self->priv->existing_categories_length1;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (!(_tmp2_ < _tmp3__length1)) {
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = self->priv->_existing_categories;
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = _tmp4_;
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!(_tmp2_ < _tmp5_)) {
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10331 "PiwigoPublishing.c"
+#line 10268 "PiwigoPublishing.c"
}
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = self->priv->existing_categories;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4__length1 = self->priv->existing_categories_length1;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = i;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = _tmp4_[_tmp5_];
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = _tmp6_->id;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp8_ = category_id;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_ == _tmp8_) {
-#line 10347 "PiwigoPublishing.c"
- gint _tmp9_ = 0;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp9_ = i;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _result_ = _tmp9_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6_ = self->priv->_existing_categories;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = i;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = gee_list_get (_tmp6_, _tmp7_);
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = (PublishingPiwigoCategory*) _tmp8_;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = _tmp9_->id;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = category_id;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = _tmp10_ == _tmp11_;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _publishing_piwigo_category_unref0 (_tmp9_);
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (_tmp12_) {
+#line 10288 "PiwigoPublishing.c"
+ gint _tmp13_ = 0;
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = i;
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _result_ = _tmp13_;
+#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10355 "PiwigoPublishing.c"
+#line 10296 "PiwigoPublishing.c"
}
}
}
}
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _result_;
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10364 "PiwigoPublishing.c"
+#line 10305 "PiwigoPublishing.c"
}
static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id) {
gint result = 0;
gint _result_ = 0;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = -1;
-#line 10375 "PiwigoPublishing.c"
+#line 10316 "PiwigoPublishing.c"
{
gint i = 0;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 10380 "PiwigoPublishing.c"
+#line 10321 "PiwigoPublishing.c"
{
gboolean _tmp0_ = FALSE;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = TRUE;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 10387 "PiwigoPublishing.c"
+#line 10328 "PiwigoPublishing.c"
gint _tmp2_ = 0;
PublishingPiwigoPermissionLevel** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
@@ -10408,85 +10349,85 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
PublishingPiwigoPermissionLevel* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 10399 "PiwigoPublishing.c"
+#line 10340 "PiwigoPublishing.c"
gint _tmp1_ = 0;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = i;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = _tmp1_ + 1;
-#line 10405 "PiwigoPublishing.c"
+#line 10346 "PiwigoPublishing.c"
}
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = i;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->perm_levels;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3__length1 = self->priv->perm_levels_length1;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!(_tmp2_ < _tmp3__length1)) {
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10419 "PiwigoPublishing.c"
+#line 10360 "PiwigoPublishing.c"
}
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->perm_levels;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4__length1 = self->priv->perm_levels_length1;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = i;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp4_[_tmp5_];
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_->id;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = permission_level_id;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ == _tmp8_) {
-#line 10435 "PiwigoPublishing.c"
+#line 10376 "PiwigoPublishing.c"
gint _tmp9_ = 0;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = i;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = _tmp9_;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10443 "PiwigoPublishing.c"
+#line 10384 "PiwigoPublishing.c"
}
}
}
}
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _result_;
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10452 "PiwigoPublishing.c"
+#line 10393 "PiwigoPublishing.c"
}
static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id) {
gint result = 0;
gint _result_ = 0;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = -1;
-#line 10463 "PiwigoPublishing.c"
+#line 10404 "PiwigoPublishing.c"
{
gint i = 0;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = 0;
-#line 10468 "PiwigoPublishing.c"
+#line 10409 "PiwigoPublishing.c"
{
gboolean _tmp0_ = FALSE;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = TRUE;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
while (TRUE) {
-#line 10475 "PiwigoPublishing.c"
+#line 10416 "PiwigoPublishing.c"
gint _tmp2_ = 0;
PublishingPiwigoSizeEntry** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
@@ -10496,142 +10437,417 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
PublishingPiwigoSizeEntry* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp0_) {
-#line 10487 "PiwigoPublishing.c"
+#line 10428 "PiwigoPublishing.c"
gint _tmp1_ = 0;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = i;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
i = _tmp1_ + 1;
-#line 10493 "PiwigoPublishing.c"
+#line 10434 "PiwigoPublishing.c"
}
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = i;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->photo_sizes;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3__length1 = self->priv->photo_sizes_length1;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!(_tmp2_ < _tmp3__length1)) {
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10507 "PiwigoPublishing.c"
+#line 10448 "PiwigoPublishing.c"
}
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->photo_sizes;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4__length1 = self->priv->photo_sizes_length1;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = i;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp4_[_tmp5_];
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_->id;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = size_id;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp7_ == _tmp8_) {
-#line 10523 "PiwigoPublishing.c"
+#line 10464 "PiwigoPublishing.c"
gint _tmp9_ = 0;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = i;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = _tmp9_;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
break;
-#line 10531 "PiwigoPublishing.c"
+#line 10472 "PiwigoPublishing.c"
}
}
}
}
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _result_;
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10540 "PiwigoPublishing.c"
+#line 10481 "PiwigoPublishing.c"
}
static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name) {
gboolean result = FALSE;
gboolean _result_ = FALSE;
- PublishingPiwigoCategory** _tmp0_ = NULL;
- gint _tmp0__length1 = 0;
-#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
-#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (category_name != NULL, FALSE);
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_result_ = FALSE;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0_ = self->priv->existing_categories;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp0__length1 = self->priv->existing_categories_length1;
-#line 10559 "PiwigoPublishing.c"
+#line 10494 "PiwigoPublishing.c"
{
- PublishingPiwigoCategory** category_collection = NULL;
- gint category_collection_length1 = 0;
- gint _category_collection_size_ = 0;
- gint category_it = 0;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- category_collection = _tmp0_;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- category_collection_length1 = _tmp0__length1;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- for (category_it = 0; category_it < _tmp0__length1; category_it = category_it + 1) {
-#line 10571 "PiwigoPublishing.c"
- PublishingPiwigoCategory* _tmp1_ = NULL;
+ GeeList* _category_list = NULL;
+ GeeList* _tmp0_ = NULL;
+ GeeList* _tmp1_ = NULL;
+ gint _category_size = 0;
+ GeeList* _tmp2_ = NULL;
+ gint _tmp3_ = 0;
+ gint _tmp4_ = 0;
+ gint _category_index = 0;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_existing_categories;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _category_list = _tmp1_;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp2_ = _category_list;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp4_ = _tmp3_;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _category_size = _tmp4_;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _category_index = -1;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ while (TRUE) {
+#line 10522 "PiwigoPublishing.c"
+ gint _tmp5_ = 0;
+ gint _tmp6_ = 0;
+ gint _tmp7_ = 0;
PublishingPiwigoCategory* category = NULL;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp1_ = _publishing_piwigo_category_ref0 (category_collection[category_it]);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- category = _tmp1_;
-#line 10578 "PiwigoPublishing.c"
- {
- PublishingPiwigoCategory* _tmp2_ = NULL;
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_ = NULL;
- gchar* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
- gboolean _tmp7_ = FALSE;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp2_ = category;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp3_ = _tmp2_->display_name;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp4_ = string_strip (_tmp3_);
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp5_ = _tmp4_;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp6_ = category_name;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_free0 (_tmp5_);
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- if (_tmp7_) {
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _result_ = TRUE;
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _publishing_piwigo_category_unref0 (category);
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- break;
-#line 10608 "PiwigoPublishing.c"
- }
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ GeeList* _tmp8_ = NULL;
+ gint _tmp9_ = 0;
+ gpointer _tmp10_ = NULL;
+ PublishingPiwigoCategory* _tmp11_ = NULL;
+ const gchar* _tmp12_ = NULL;
+ gchar* _tmp13_ = NULL;
+ gchar* _tmp14_ = NULL;
+ const gchar* _tmp15_ = NULL;
+ gboolean _tmp16_ = FALSE;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp5_ = _category_index;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _category_index = _tmp5_ + 1;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp6_ = _category_index;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp7_ = _category_size;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (!(_tmp6_ < _tmp7_)) {
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 10548 "PiwigoPublishing.c"
+ }
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp8_ = _category_list;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp9_ = _category_index;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp10_ = gee_list_get (_tmp8_, _tmp9_);
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ category = (PublishingPiwigoCategory*) _tmp10_;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp11_ = category;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp12_ = _tmp11_->display_name;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp13_ = string_strip (_tmp12_);
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp14_ = _tmp13_;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp15_ = category_name;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp16_ = g_strcmp0 (_tmp14_, _tmp15_) == 0;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (_tmp14_);
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ if (_tmp16_) {
+#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _result_ = TRUE;
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_category_unref0 (category);
-#line 10612 "PiwigoPublishing.c"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 10580 "PiwigoPublishing.c"
}
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _publishing_piwigo_category_unref0 (category);
+#line 10584 "PiwigoPublishing.c"
}
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (_category_list);
+#line 10588 "PiwigoPublishing.c"
}
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _result_;
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10594 "PiwigoPublishing.c"
+}
+
+
+static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self) {
+ gint result;
+ gint _tmp0_ = 0;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_last_category;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10609 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+ gint _tmp0_ = 0;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_last_category = _tmp0_;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "last-category");
+#line 10623 "PiwigoPublishing.c"
+}
+
+
+static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self) {
+ gint result;
+ gint _tmp0_ = 0;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_last_permission_level;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10638 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+ gint _tmp0_ = 0;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_last_permission_level = _tmp0_;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "last-permission-level");
+#line 10652 "PiwigoPublishing.c"
+}
+
+
+static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self) {
+ gint result;
+ gint _tmp0_ = 0;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_last_photo_size;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10667 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+ gint _tmp0_ = 0;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_last_photo_size = _tmp0_;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "last-photo-size");
+#line 10681 "PiwigoPublishing.c"
+}
+
+
+static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self) {
+ gboolean result;
+ gboolean _tmp0_ = FALSE;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_last_title_as_comment;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10696 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+ gboolean _tmp0_ = FALSE;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_last_title_as_comment = _tmp0_;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "last-title-as-comment");
+#line 10710 "PiwigoPublishing.c"
+}
+
+
+static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self) {
+ gboolean result;
+ gboolean _tmp0_ = FALSE;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_last_no_upload_tags;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10725 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+ gboolean _tmp0_ = FALSE;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_last_no_upload_tags = _tmp0_;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "last-no-upload-tags");
+#line 10739 "PiwigoPublishing.c"
+}
+
+
+static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self) {
+ gboolean result;
+ gboolean _tmp0_ = FALSE;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_strip_metadata_enabled;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10754 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+ gboolean _tmp0_ = FALSE;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_strip_metadata_enabled = _tmp0_;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "strip-metadata-enabled");
+#line 10768 "PiwigoPublishing.c"
+}
+
+
+static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self) {
+ GeeList* result;
+ GeeList* _tmp0_ = NULL;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_existing_categories;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10620 "PiwigoPublishing.c"
+#line 10783 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value) {
+ GeeList* _tmp0_ = NULL;
+ GeeList* _tmp1_ = NULL;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->_existing_categories);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_existing_categories = _tmp1_;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "existing-categories");
+#line 10802 "PiwigoPublishing.c"
+}
+
+
+static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self) {
+ const gchar* result;
+ const gchar* _tmp0_ = NULL;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = self->priv->_default_comment;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ result = _tmp0_;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ return result;
+#line 10817 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value) {
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp0_ = value;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (self->priv->_default_comment);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->_default_comment = _tmp1_;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_notify ((GObject *) self, "default-comment");
+#line 10836 "PiwigoPublishing.c"
}
@@ -10642,130 +10858,135 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER
register gpointer data1;
register gpointer data2;
cc = (GCClosure *) closure;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (n_param_values == 3);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data1 = closure->data;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = param_values->data[0].v_pointer;
-#line 10639 "PiwigoPublishing.c"
+#line 10855 "PiwigoPublishing.c"
} else {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data1 = param_values->data[0].v_pointer;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
data2 = closure->data;
-#line 10645 "PiwigoPublishing.c"
+#line 10861 "PiwigoPublishing.c"
}
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 10651 "PiwigoPublishing.c"
+#line 10867 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass) {
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoPublishingOptionsPanePrivate));
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ ((GObjectClass *) klass)->constructed = publishing_piwigo_publishing_options_pane_real_constructed;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ ((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = publishing_piwigo_publishing_options_pane_real_on_pane_installed;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_publishing_options_pane_get_property;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_CLASS (klass)->set_property = _vala_publishing_piwigo_publishing_options_pane_set_property;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_publishing_options_pane_finalize;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_signal_new ("logout", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _ ("Shotwell Connect");
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp1_;
-#line 10674 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_get_widget;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_get_preferred_geometry;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_installed;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled;
-#line 10689 "PiwigoPublishing.c"
+#line 10914 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_options_pane_instance_init (PublishingPiwigoPublishingOptionsPane * self) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->pane_widget = NULL;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->strip_metadata_check = NULL;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->title_as_comment_check = NULL;
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->no_upload_tags_check = NULL;
-#line 10704 "PiwigoPublishing.c"
+#line 10927 "PiwigoPublishing.c"
}
static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) {
PublishingPiwigoPublishingOptionsPane * self;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- _g_object_unref0 (self->priv->builder);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->use_existing_radio);
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->create_new_radio);
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->existing_categories_combo);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->new_category_entry);
-#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->within_existing_label);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->within_existing_combo);
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->perms_combo);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->size_combo);
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->title_as_comment_check);
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->no_upload_tags_check);
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->album_comment);
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (self->priv->album_comment_label);
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->existing_categories = (_vala_array_free (self->priv->existing_categories, self->priv->existing_categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_object_unref0 (self->priv->_existing_categories);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ _g_free0 (self->priv->_default_comment);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj);
-#line 10754 "PiwigoPublishing.c"
+#line 10975 "PiwigoPublishing.c"
}
@@ -10776,30 +10997,156 @@ GType publishing_piwigo_publishing_options_pane_get_type (void) {
static volatile gsize publishing_piwigo_publishing_options_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_piwigo_publishing_options_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_piwigo_publishing_options_pane_instance_init, NULL };
- static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType publishing_piwigo_publishing_options_pane_type_id;
- publishing_piwigo_publishing_options_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingPiwigoPublishingOptionsPane", &g_define_type_info, 0);
- g_type_add_interface_static (publishing_piwigo_publishing_options_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+ publishing_piwigo_publishing_options_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, "PublishingPiwigoPublishingOptionsPane", &g_define_type_info, 0);
g_once_init_leave (&publishing_piwigo_publishing_options_pane_type_id__volatile, publishing_piwigo_publishing_options_pane_type_id);
}
return publishing_piwigo_publishing_options_pane_type_id__volatile;
}
+static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+ PublishingPiwigoPublishingOptionsPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ switch (property_id) {
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_category (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_permission_level (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_photo_size (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_object (value, publishing_piwigo_publishing_options_pane_get_existing_categories (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_value_set_string (value, publishing_piwigo_publishing_options_pane_get_default_comment (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 11047 "PiwigoPublishing.c"
+ default:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 11053 "PiwigoPublishing.c"
+ }
+}
+
+
+static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+ PublishingPiwigoPublishingOptionsPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ switch (property_id) {
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_last_category (self, g_value_get_int (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_last_permission_level (self, g_value_get_int (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_last_photo_size (self, g_value_get_int (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_last_title_as_comment (self, g_value_get_boolean (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (self, g_value_get_boolean (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (self, g_value_get_boolean (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_existing_categories (self, g_value_get_object (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ publishing_piwigo_publishing_options_pane_set_default_comment (self, g_value_get_string (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 11111 "PiwigoPublishing.c"
+ default:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ break;
+#line 11117 "PiwigoPublishing.c"
+ }
+}
+
+
PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type) {
PublishingPiwigoSession* self = NULL;
-#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, "");
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 10781 "PiwigoPublishing.c"
+#line 11128 "PiwigoPublishing.c"
}
PublishingPiwigoSession* publishing_piwigo_session_new (void) {
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION);
-#line 10788 "PiwigoPublishing.c"
+#line 11135 "PiwigoPublishing.c"
}
@@ -10809,43 +11156,43 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
const gchar* _tmp2_ = NULL;
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = self->priv->pwg_id;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp2_ != NULL) {
-#line 10804 "PiwigoPublishing.c"
+#line 11151 "PiwigoPublishing.c"
const gchar* _tmp3_ = NULL;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = self->priv->pwg_url;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = _tmp3_ != NULL;
-#line 10810 "PiwigoPublishing.c"
+#line 11157 "PiwigoPublishing.c"
} else {
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = FALSE;
-#line 10814 "PiwigoPublishing.c"
+#line 11161 "PiwigoPublishing.c"
}
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp1_) {
-#line 10818 "PiwigoPublishing.c"
+#line 11165 "PiwigoPublishing.c"
const gchar* _tmp4_ = NULL;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = self->priv->username;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = _tmp4_ != NULL;
-#line 10824 "PiwigoPublishing.c"
+#line 11171 "PiwigoPublishing.c"
} else {
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = FALSE;
-#line 10828 "PiwigoPublishing.c"
+#line 11175 "PiwigoPublishing.c"
}
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp0_;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10834 "PiwigoPublishing.c"
+#line 11181 "PiwigoPublishing.c"
}
@@ -10856,58 +11203,58 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons
gchar* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (url != NULL);
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (username != NULL);
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (id != NULL);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = url;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_url);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->pwg_url = _tmp1_;
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = username;
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->username);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->username = _tmp3_;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = id;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = g_strdup (_tmp4_);
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_id);
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->pwg_id = _tmp5_;
-#line 10877 "PiwigoPublishing.c"
+#line 11224 "PiwigoPublishing.c"
}
void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_url);
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->pwg_url = NULL;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_id);
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->pwg_id = NULL;
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->username);
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->username = NULL;
-#line 10896 "PiwigoPublishing.c"
+#line 11243 "PiwigoPublishing.c"
}
@@ -10915,17 +11262,17 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->username;
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10914 "PiwigoPublishing.c"
+#line 11261 "PiwigoPublishing.c"
}
@@ -10933,17 +11280,17 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->pwg_url;
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10932 "PiwigoPublishing.c"
+#line 11279 "PiwigoPublishing.c"
}
@@ -10951,78 +11298,78 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
gchar* result = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = self->priv->pwg_id;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp1_;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 10950 "PiwigoPublishing.c"
+#line 11297 "PiwigoPublishing.c"
}
void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) {
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_if_fail (id != NULL);
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = id;
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_id);
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->pwg_id = _tmp1_;
-#line 10969 "PiwigoPublishing.c"
+#line 11316 "PiwigoPublishing.c"
}
static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass) {
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_parent_class = g_type_class_peek_parent (klass);
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_piwigo_session_finalize;
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate));
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_piwigo_session_real_is_authenticated;
-#line 10982 "PiwigoPublishing.c"
+#line 11329 "PiwigoPublishing.c"
}
static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * self) {
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_SESSION_GET_PRIVATE (self);
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->pwg_url = NULL;
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->pwg_id = NULL;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->username = NULL;
-#line 10995 "PiwigoPublishing.c"
+#line 11342 "PiwigoPublishing.c"
}
static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj) {
PublishingPiwigoSession * self;
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_url);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->pwg_id);
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (self->priv->username);
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj);
-#line 11011 "PiwigoPublishing.c"
+#line 11358 "PiwigoPublishing.c"
}
@@ -11047,52 +11394,52 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje
PublishingPiwigoSession* _tmp0_ = NULL;
PublishingPiwigoSession* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = session;
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp2_) {
-#line 11048 "PiwigoPublishing.c"
+#line 11395 "PiwigoPublishing.c"
PublishingPiwigoSession* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = session;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = publishing_piwigo_session_get_pwg_id (_tmp3_);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _tmp4_;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = g_strconcat ("pwg_id=", _tmp5_, NULL);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp6_;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp7_);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp7_);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp5_);
-#line 11070 "PiwigoPublishing.c"
+#line 11417 "PiwigoPublishing.c"
}
-#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11074 "PiwigoPublishing.c"
+#line 11421 "PiwigoPublishing.c"
}
PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) {
-#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11081 "PiwigoPublishing.c"
+#line 11428 "PiwigoPublishing.c"
}
@@ -11107,46 +11454,46 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticat
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = session;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = publishing_piwigo_session_get_pwg_url (_tmp1_);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = _tmp2_;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp3_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = session;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = g_strconcat ("pwg_id=", _tmp6_, NULL);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = _tmp7_;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp8_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp8_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp6_);
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11128 "PiwigoPublishing.c"
+#line 11475 "PiwigoPublishing.c"
}
PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) {
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11135 "PiwigoPublishing.c"
+#line 11482 "PiwigoPublishing.c"
}
@@ -11170,143 +11517,143 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
gchar* _tmp18_ = NULL;
gchar* _tmp19_ = NULL;
GError * _inner_error_ = NULL;
-#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = doc;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
root = _tmp1_;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = root;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
status = _tmp3_;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = status;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp4_ == NULL) {
-#line 11177 "PiwigoPublishing.c"
+#line 11524 "PiwigoPublishing.c"
gchar* _tmp5_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = g_strdup ("No status property in root node");
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp5_;
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11187 "PiwigoPublishing.c"
+#line 11534 "PiwigoPublishing.c"
}
-#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = status;
-#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = NULL;
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11199 "PiwigoPublishing.c"
+#line 11546 "PiwigoPublishing.c"
}
{
xmlNode* _tmp7_ = NULL;
PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
xmlNode* _tmp9_ = NULL;
xmlNode* _tmp10_ = NULL;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = doc;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = root;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _tmp10_;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11218 "PiwigoPublishing.c"
- goto __catch47_spit_publishing_publishing_error;
+#line 11565 "PiwigoPublishing.c"
+ goto __catch44_spit_publishing_publishing_error;
}
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11229 "PiwigoPublishing.c"
+#line 11576 "PiwigoPublishing.c"
}
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
errcode = _tmp7_;
-#line 11233 "PiwigoPublishing.c"
+#line 11580 "PiwigoPublishing.c"
}
- goto __finally47;
- __catch47_spit_publishing_publishing_error:
+ goto __finally44;
+ __catch44_spit_publishing_publishing_error:
{
GError* err = NULL;
gchar* _tmp11_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = g_strdup ("No error code specified");
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp11_;
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11254 "PiwigoPublishing.c"
+#line 11601 "PiwigoPublishing.c"
}
- __finally47:
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ __finally44:
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11267 "PiwigoPublishing.c"
+#line 11614 "PiwigoPublishing.c"
}
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = errcode;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = _tmp13_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp15_ = errcode;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = _tmp16_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = _tmp18_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp17_);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp14_);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp19_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (status);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11295 "PiwigoPublishing.c"
+#line 11642 "PiwigoPublishing.c"
}
@@ -11319,93 +11666,93 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
xmlNode* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
GError * _inner_error_ = NULL;
-#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = doc;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
root = _tmp1_;
-#line 11316 "PiwigoPublishing.c"
+#line 11663 "PiwigoPublishing.c"
{
xmlNode* _tmp2_ = NULL;
PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
xmlNode* _tmp5_ = NULL;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = doc;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = root;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "err", &_inner_error_);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = _tmp5_;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11334 "PiwigoPublishing.c"
- goto __catch48_spit_publishing_publishing_error;
+#line 11681 "PiwigoPublishing.c"
+ goto __catch45_spit_publishing_publishing_error;
}
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11343 "PiwigoPublishing.c"
+#line 11690 "PiwigoPublishing.c"
}
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
errcode = _tmp2_;
-#line 11347 "PiwigoPublishing.c"
+#line 11694 "PiwigoPublishing.c"
}
- goto __finally48;
- __catch48_spit_publishing_publishing_error:
+ goto __finally45;
+ __catch45_spit_publishing_publishing_error:
{
GError* err = NULL;
gchar* _tmp6_ = NULL;
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
err = _inner_error_;
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_inner_error_ = NULL;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = g_strdup ("0");
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp6_;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_error_free0 (err);
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11366 "PiwigoPublishing.c"
+#line 11713 "PiwigoPublishing.c"
}
- __finally48:
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ __finally45:
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_clear_error (&_inner_error_);
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return NULL;
-#line 11377 "PiwigoPublishing.c"
+#line 11724 "PiwigoPublishing.c"
}
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = errcode;
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = (gchar*) xmlGetProp (_tmp7_, (xmlChar*) "code");
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
result = _tmp8_;
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return result;
-#line 11387 "PiwigoPublishing.c"
+#line 11734 "PiwigoPublishing.c"
}
static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) {
-#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11394 "PiwigoPublishing.c"
+#line 11741 "PiwigoPublishing.c"
}
@@ -11439,47 +11786,47 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
const gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (username != NULL, NULL);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (password != NULL, NULL);
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = url;
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.login");
-#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = username;
-#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp2_);
-#line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = password;
-#line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11454 "PiwigoPublishing.c"
+#line 11801 "PiwigoPublishing.c"
}
PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password);
-#line 11461 "PiwigoPublishing.c"
+#line 11808 "PiwigoPublishing.c"
}
static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 11468 "PiwigoPublishing.c"
+#line 11815 "PiwigoPublishing.c"
}
@@ -11492,87 +11839,87 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
PublishingPiwigoTransaction* _tmp4_ = NULL;
gint _tmp5_ = 0;
PublishingRESTSupportArgument** _tmp6_ = NULL;
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_TRANSACTION (other), NULL);
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = other;
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = _tmp2_;
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp3_);
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = other;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_);
-#line 11501 "PiwigoPublishing.c"
+#line 11848 "PiwigoPublishing.c"
{
PublishingRESTSupportArgument** argument_collection = NULL;
gint argument_collection_length1 = 0;
gint _argument_collection_size_ = 0;
gint argument_it = 0;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
argument_collection = _tmp6_;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
argument_collection_length1 = _tmp5_;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) {
-#line 11513 "PiwigoPublishing.c"
+#line 11860 "PiwigoPublishing.c"
PublishingRESTSupportArgument* _tmp7_ = NULL;
PublishingRESTSupportArgument* argument = NULL;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
argument = _tmp7_;
-#line 11520 "PiwigoPublishing.c"
+#line 11867 "PiwigoPublishing.c"
{
PublishingRESTSupportArgument* _tmp8_ = NULL;
const gchar* _tmp9_ = NULL;
PublishingRESTSupportArgument* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = argument;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = _tmp8_->key;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = argument;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = _tmp10_->value;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_);
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_rest_support_argument_unref0 (argument);
-#line 11538 "PiwigoPublishing.c"
+#line 11885 "PiwigoPublishing.c"
}
}
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 11543 "PiwigoPublishing.c"
+#line 11890 "PiwigoPublishing.c"
}
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11547 "PiwigoPublishing.c"
+#line 11894 "PiwigoPublishing.c"
}
PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other);
-#line 11554 "PiwigoPublishing.c"
+#line 11901 "PiwigoPublishing.c"
}
static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) {
-#line 1677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11561 "PiwigoPublishing.c"
+#line 11908 "PiwigoPublishing.c"
}
@@ -11604,77 +11951,77 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (url != NULL, NULL);
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (pwg_id != NULL, NULL);
-#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = url;
-#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = session;
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_session_get_pwg_id (_tmp2_);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_;
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = g_strconcat ("pwg_id=", _tmp4_, NULL);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = _tmp5_;
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp6_);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp6_);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp4_);
-#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11625 "PiwigoPublishing.c"
+#line 11972 "PiwigoPublishing.c"
}
PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id);
-#line 11632 "PiwigoPublishing.c"
+#line 11979 "PiwigoPublishing.c"
}
PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
PublishingPiwigoSessionGetStatusTransaction* self = NULL;
PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11649 "PiwigoPublishing.c"
+#line 11996 "PiwigoPublishing.c"
}
PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) {
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session);
-#line 11656 "PiwigoPublishing.c"
+#line 12003 "PiwigoPublishing.c"
}
static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) {
-#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11663 "PiwigoPublishing.c"
+#line 12010 "PiwigoPublishing.c"
}
@@ -11700,33 +12047,33 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) {
PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
PublishingPiwigoCategoriesGetListTransaction* self = NULL;
PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.getList");
-#line 1721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true");
-#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11701 "PiwigoPublishing.c"
+#line 12048 "PiwigoPublishing.c"
}
PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) {
-#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session);
-#line 11708 "PiwigoPublishing.c"
+#line 12055 "PiwigoPublishing.c"
}
static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) {
-#line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11715 "PiwigoPublishing.c"
+#line 12062 "PiwigoPublishing.c"
}
@@ -11752,31 +12099,31 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
PublishingPiwigoSessionLogoutTransaction* self = NULL;
PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout");
-#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11751 "PiwigoPublishing.c"
+#line 12098 "PiwigoPublishing.c"
}
PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) {
-#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session);
-#line 11758 "PiwigoPublishing.c"
+#line 12105 "PiwigoPublishing.c"
}
static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) {
-#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11765 "PiwigoPublishing.c"
+#line 12112 "PiwigoPublishing.c"
}
@@ -11802,69 +12149,69 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans
const gchar* _tmp1_ = NULL;
gint _tmp2_ = 0;
const gchar* _tmp6_ = NULL;
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (category != NULL, NULL);
-#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.add");
-#line 1738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = category;
-#line 1738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp1_);
-#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = parent_id;
-#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp2_ != 0) {
-#line 11809 "PiwigoPublishing.c"
+#line 12156 "PiwigoPublishing.c"
gint _tmp3_ = 0;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = parent_id;
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = g_strdup_printf ("%i", _tmp3_);
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = _tmp4_;
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_);
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp5_);
-#line 11823 "PiwigoPublishing.c"
+#line 12170 "PiwigoPublishing.c"
}
-#line 1744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = comment;
-#line 1744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (_tmp6_, "") != 0) {
-#line 11829 "PiwigoPublishing.c"
+#line 12176 "PiwigoPublishing.c"
const gchar* _tmp7_ = NULL;
-#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = comment;
-#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_);
-#line 11835 "PiwigoPublishing.c"
+#line 12182 "PiwigoPublishing.c"
}
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 11839 "PiwigoPublishing.c"
+#line 12186 "PiwigoPublishing.c"
}
PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment);
-#line 11846 "PiwigoPublishing.c"
+#line 12193 "PiwigoPublishing.c"
}
static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) {
-#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11853 "PiwigoPublishing.c"
+#line 12200 "PiwigoPublishing.c"
}
@@ -11897,7 +12244,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 11886 "PiwigoPublishing.c"
+#line 12233 "PiwigoPublishing.c"
}
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp3_ = str_array;
@@ -11907,7 +12254,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 11896 "PiwigoPublishing.c"
+#line 12243 "PiwigoPublishing.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -11917,13 +12264,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 11906 "PiwigoPublishing.c"
+#line 12253 "PiwigoPublishing.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 11912 "PiwigoPublishing.c"
+#line 12259 "PiwigoPublishing.c"
} else {
gboolean _tmp5_ = FALSE;
gchar** _tmp6_ = NULL;
@@ -11934,7 +12281,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 11923 "PiwigoPublishing.c"
+#line 12270 "PiwigoPublishing.c"
gchar** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
const gchar* _tmp8_ = NULL;
@@ -11946,19 +12293,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 11935 "PiwigoPublishing.c"
+#line 12282 "PiwigoPublishing.c"
} else {
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp5_ = FALSE;
-#line 11939 "PiwigoPublishing.c"
+#line 12286 "PiwigoPublishing.c"
}
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp1_ = _tmp5_;
-#line 11943 "PiwigoPublishing.c"
+#line 12290 "PiwigoPublishing.c"
}
#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_) {
-#line 11947 "PiwigoPublishing.c"
+#line 12294 "PiwigoPublishing.c"
gint i = 0;
gsize len = 0UL;
gint _tmp31_ = 0;
@@ -11981,7 +12328,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 11970 "PiwigoPublishing.c"
+#line 12317 "PiwigoPublishing.c"
{
gboolean _tmp9_ = FALSE;
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -11990,7 +12337,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 11979 "PiwigoPublishing.c"
+#line 12326 "PiwigoPublishing.c"
gboolean _tmp11_ = FALSE;
gboolean _tmp12_ = FALSE;
gchar** _tmp13_ = NULL;
@@ -12003,13 +12350,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 11992 "PiwigoPublishing.c"
+#line 12339 "PiwigoPublishing.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 11998 "PiwigoPublishing.c"
+#line 12345 "PiwigoPublishing.c"
}
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = FALSE;
@@ -12019,7 +12366,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 12008 "PiwigoPublishing.c"
+#line 12355 "PiwigoPublishing.c"
gint _tmp14_ = 0;
gchar** _tmp15_ = NULL;
gint _tmp15__length1 = 0;
@@ -12031,17 +12378,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 12020 "PiwigoPublishing.c"
+#line 12367 "PiwigoPublishing.c"
} else {
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
-#line 12024 "PiwigoPublishing.c"
+#line 12371 "PiwigoPublishing.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 12030 "PiwigoPublishing.c"
+#line 12377 "PiwigoPublishing.c"
} else {
gboolean _tmp16_ = FALSE;
gchar** _tmp17_ = NULL;
@@ -12052,7 +12399,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 12041 "PiwigoPublishing.c"
+#line 12388 "PiwigoPublishing.c"
gchar** _tmp18_ = NULL;
gint _tmp18__length1 = 0;
gint _tmp19_ = 0;
@@ -12067,21 +12414,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 12056 "PiwigoPublishing.c"
+#line 12403 "PiwigoPublishing.c"
} else {
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp16_ = FALSE;
-#line 12060 "PiwigoPublishing.c"
+#line 12407 "PiwigoPublishing.c"
}
#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp11_ = _tmp16_;
-#line 12064 "PiwigoPublishing.c"
+#line 12411 "PiwigoPublishing.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 12070 "PiwigoPublishing.c"
+#line 12417 "PiwigoPublishing.c"
}
#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp22_ = str_array;
@@ -12093,7 +12440,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 12082 "PiwigoPublishing.c"
+#line 12429 "PiwigoPublishing.c"
gchar** _tmp25_ = NULL;
gint _tmp25__length1 = 0;
gint _tmp26_ = 0;
@@ -12114,24 +12461,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 12103 "PiwigoPublishing.c"
+#line 12450 "PiwigoPublishing.c"
} else {
#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp21_ = 0;
-#line 12107 "PiwigoPublishing.c"
+#line 12454 "PiwigoPublishing.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 12113 "PiwigoPublishing.c"
+#line 12460 "PiwigoPublishing.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 12120 "PiwigoPublishing.c"
+#line 12467 "PiwigoPublishing.c"
gchar* _tmp32_ = NULL;
#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp32_ = g_strdup ("");
@@ -12139,7 +12486,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 12128 "PiwigoPublishing.c"
+#line 12475 "PiwigoPublishing.c"
}
#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp33_ = i;
@@ -12177,7 +12524,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 12166 "PiwigoPublishing.c"
+#line 12513 "PiwigoPublishing.c"
{
gboolean _tmp46_ = FALSE;
#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -12186,7 +12533,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 12175 "PiwigoPublishing.c"
+#line 12522 "PiwigoPublishing.c"
gint _tmp48_ = 0;
gchar** _tmp49_ = NULL;
gint _tmp49__length1 = 0;
@@ -12202,13 +12549,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 12191 "PiwigoPublishing.c"
+#line 12538 "PiwigoPublishing.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 12197 "PiwigoPublishing.c"
+#line 12544 "PiwigoPublishing.c"
}
#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp46_ = FALSE;
@@ -12222,7 +12569,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 12211 "PiwigoPublishing.c"
+#line 12558 "PiwigoPublishing.c"
}
#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp50_ = ptr;
@@ -12242,7 +12589,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 12231 "PiwigoPublishing.c"
+#line 12578 "PiwigoPublishing.c"
gchar** _tmp57_ = NULL;
gint _tmp57__length1 = 0;
gint _tmp58_ = 0;
@@ -12257,11 +12604,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 12246 "PiwigoPublishing.c"
+#line 12593 "PiwigoPublishing.c"
} else {
#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp53_ = "";
-#line 12250 "PiwigoPublishing.c"
+#line 12597 "PiwigoPublishing.c"
}
#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp60_ = ptr;
@@ -12269,7 +12616,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 12258 "PiwigoPublishing.c"
+#line 12605 "PiwigoPublishing.c"
}
}
#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -12280,7 +12627,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 12269 "PiwigoPublishing.c"
+#line 12616 "PiwigoPublishing.c"
} else {
gchar* _tmp63_ = NULL;
#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -12289,15 +12636,15 @@ 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 12278 "PiwigoPublishing.c"
+#line 12625 "PiwigoPublishing.c"
}
}
static void _g_free0_ (gpointer var) {
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
var = (g_free (var), NULL);
-#line 12286 "PiwigoPublishing.c"
+#line 12633 "PiwigoPublishing.c"
}
@@ -12363,381 +12710,381 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
gchar* _tmp74_ = NULL;
gchar* _tmp75_ = NULL;
gchar* _tmp76_ = NULL;
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp0_ = session;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp1_ = publishable;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp2_ = session;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp3_ = publishing_piwigo_session_get_pwg_url (_tmp2_);
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp4_ = _tmp3_;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp4_);
-#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp5_ = session;
-#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp6_) {
-#line 12378 "PiwigoPublishing.c"
+#line 12725 "PiwigoPublishing.c"
PublishingPiwigoSession* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp7_ = session;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp8_ = publishing_piwigo_session_get_pwg_id (_tmp7_);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp9_ = _tmp8_;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp10_ = g_strconcat ("pwg_id=", _tmp9_, NULL);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp11_ = _tmp10_;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp11_);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp11_);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp9_);
-#line 12400 "PiwigoPublishing.c"
+#line 12747 "PiwigoPublishing.c"
}
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp12_ = parameters;
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp13_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp12_);
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->parameters = _tmp13_;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp14_ = publishable;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp16_ = spit_publishing_publishable_get_publishing_keywords (_tmp14_, &_tmp15_);
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
keywords = _tmp16_;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
keywords_length1 = _tmp15_;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_keywords_size_ = keywords_length1;
-#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp17_ = g_strdup ("");
-#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
tags = _tmp17_;
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18_ = keywords;
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp18__length1 = keywords_length1;
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp18_ != NULL) {
-#line 12430 "PiwigoPublishing.c"
+#line 12777 "PiwigoPublishing.c"
gchar** _tmp19_ = NULL;
gint _tmp19__length1 = 0;
gchar* _tmp20_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19_ = keywords;
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp19__length1 = keywords_length1;
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp20_ = _vala_g_strjoinv (",", _tmp19_, _tmp19__length1);
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (tags);
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
tags = _tmp20_;
-#line 12444 "PiwigoPublishing.c"
+#line 12791 "PiwigoPublishing.c"
}
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp21_ = publishable;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp22_ = spit_publishing_publishable_get_serialized_file (_tmp21_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp23_ = _tmp22_;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp24_ = g_file_get_basename (_tmp23_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp25_ = _tmp24_;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp26_ = parameters;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp27_ = _tmp26_->category;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp28_ = _tmp27_->id;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp29_ = parameters;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp30_ = _tmp29_->perm_level;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp31_ = _tmp30_->id;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
- g_debug ("PiwigoPublishing.vala:1766: PiwigoConnector: Uploading photo %s to cat" \
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+ g_debug ("PiwigoPublishing.vala:1730: PiwigoConnector: Uploading photo %s to cat" \
"egory id %d with perm level %d", _tmp25_, _tmp28_, _tmp31_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp25_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_object_unref0 (_tmp23_);
-#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp32_ = publishable;
-#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp33_ = spit_publishing_publishable_get_publishing_name (_tmp32_);
-#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
name = _tmp33_;
-#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp34_ = publishable;
-#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp35_ = spit_publishing_publishable_get_param_string (_tmp34_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
comment = _tmp35_;
-#line 1772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp36_ = name;
-#line 1772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (_tmp36_, "") != 0) {
-#line 12490 "PiwigoPublishing.c"
+#line 12837 "PiwigoPublishing.c"
SpitPublishingPublishable* _tmp37_ = NULL;
gchar* _tmp38_ = NULL;
const gchar* _tmp39_ = NULL;
gboolean _tmp40_ = FALSE;
const gchar* _tmp41_ = NULL;
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp37_ = publishable;
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp38_ = spit_publishing_publishable_get_param_string (_tmp37_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
name = _tmp38_;
-#line 1775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp39_ = name;
-#line 1775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_);
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp41_ = comment;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp41_ != NULL) {
-#line 12512 "PiwigoPublishing.c"
+#line 12859 "PiwigoPublishing.c"
const gchar* _tmp42_ = NULL;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp42_ = comment;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp40_ = g_strcmp0 (_tmp42_, "") != 0;
-#line 12518 "PiwigoPublishing.c"
+#line 12865 "PiwigoPublishing.c"
} else {
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp40_ = FALSE;
-#line 12522 "PiwigoPublishing.c"
+#line 12869 "PiwigoPublishing.c"
}
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp40_) {
-#line 12526 "PiwigoPublishing.c"
+#line 12873 "PiwigoPublishing.c"
const gchar* _tmp43_ = NULL;
-#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp43_ = comment;
-#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp43_);
-#line 12532 "PiwigoPublishing.c"
+#line 12879 "PiwigoPublishing.c"
}
} else {
gboolean _tmp44_ = FALSE;
const gchar* _tmp45_ = NULL;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp45_ = comment;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp45_ != NULL) {
-#line 12541 "PiwigoPublishing.c"
+#line 12888 "PiwigoPublishing.c"
const gchar* _tmp46_ = NULL;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp46_ = comment;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp44_ = g_strcmp0 (_tmp46_, "") != 0;
-#line 12547 "PiwigoPublishing.c"
+#line 12894 "PiwigoPublishing.c"
} else {
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp44_ = FALSE;
-#line 12551 "PiwigoPublishing.c"
+#line 12898 "PiwigoPublishing.c"
}
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp44_) {
-#line 12555 "PiwigoPublishing.c"
+#line 12902 "PiwigoPublishing.c"
const gchar* _tmp47_ = NULL;
const gchar* _tmp48_ = NULL;
-#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp47_ = name;
-#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp47_);
-#line 1783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp48_ = comment;
-#line 1783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp48_);
-#line 12566 "PiwigoPublishing.c"
+#line 12913 "PiwigoPublishing.c"
} else {
PublishingPiwigoPublishingParameters* _tmp49_ = NULL;
gboolean _tmp50_ = FALSE;
-#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp49_ = parameters;
-#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp50_ = _tmp49_->title_as_comment;
-#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (_tmp50_) {
-#line 12576 "PiwigoPublishing.c"
+#line 12923 "PiwigoPublishing.c"
const gchar* _tmp51_ = NULL;
-#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp51_ = name;
-#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp51_);
-#line 12582 "PiwigoPublishing.c"
+#line 12929 "PiwigoPublishing.c"
} else {
const gchar* _tmp52_ = NULL;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp52_ = name;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp52_);
-#line 12589 "PiwigoPublishing.c"
+#line 12936 "PiwigoPublishing.c"
}
}
}
-#line 1795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple");
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp53_ = parameters;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp54_ = _tmp53_->category;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp55_ = _tmp54_->id;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp56_ = g_strdup_printf ("%i", _tmp55_);
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp57_ = _tmp56_;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp57_);
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp57_);
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp58_ = parameters;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp59_ = _tmp58_->perm_level;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp60_ = _tmp59_->id;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp61_ = g_strdup_printf ("%i", _tmp60_);
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp62_ = _tmp61_;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp62_);
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp62_);
-#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp63_ = parameters;
-#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp64_ = _tmp63_->no_upload_tags;
-#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (!_tmp64_) {
-#line 12629 "PiwigoPublishing.c"
+#line 12976 "PiwigoPublishing.c"
const gchar* _tmp65_ = NULL;
-#line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp65_ = tags;
-#line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
if (g_strcmp0 (_tmp65_, "") != 0) {
-#line 12635 "PiwigoPublishing.c"
+#line 12982 "PiwigoPublishing.c"
const gchar* _tmp66_ = NULL;
-#line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp66_ = tags;
-#line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp66_);
-#line 12641 "PiwigoPublishing.c"
+#line 12988 "PiwigoPublishing.c"
}
}
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp67_ = g_str_hash;
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp68_ = g_str_equal;
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp69_ = g_hash_table_new_full (_tmp67_, _tmp68_, _g_free0_, _g_free0_);
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
disposition_table = _tmp69_;
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp70_ = g_strdup ("filename");
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp71_ = publishable;
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp72_ = spit_publishing_publishable_get_param_string (_tmp71_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp73_ = _tmp72_;
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp74_ = soup_uri_encode (_tmp73_, NULL);
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_hash_table_insert (disposition_table, _tmp70_, _tmp74_);
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (_tmp73_);
-#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp75_ = g_strdup ("name");
-#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_tmp76_ = g_strdup ("image");
-#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_hash_table_insert (disposition_table, _tmp75_, _tmp76_);
-#line 1817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_hash_table_unref0 (disposition_table);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (comment);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (name);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_g_free0 (tags);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return self;
-#line 12686 "PiwigoPublishing.c"
+#line 13033 "PiwigoPublishing.c"
}
PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable);
-#line 12693 "PiwigoPublishing.c"
+#line 13040 "PiwigoPublishing.c"
}
static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass) {
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
publishing_piwigo_images_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize;
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate));
-#line 12704 "PiwigoPublishing.c"
+#line 13051 "PiwigoPublishing.c"
}
static void publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self) {
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self);
-#line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self->priv->parameters = NULL;
-#line 12713 "PiwigoPublishing.c"
+#line 13060 "PiwigoPublishing.c"
}
static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj) {
PublishingPiwigoImagesAddTransaction * self;
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction);
-#line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj);
-#line 12725 "PiwigoPublishing.c"
+#line 13072 "PiwigoPublishing.c"
}
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 0b98f05..ca07554 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -85,6 +85,10 @@ internal class Category {
public bool is_local() {
return this.id == NO_ID;
}
+
+ public static bool equal (Category self, Category other) {
+ return self.id == other.id;
+ }
}
internal class PermissionLevel {
@@ -613,35 +617,29 @@ public class PiwigoPublisher : Spit.Publishing.Publisher, GLib.Object {
string name = "";
string id_string = "";
string uppercats = "";
+ var id_map = new Gee.HashMap<string, string> ();
+
for ( ; category_node_iter != null; category_node_iter = category_node_iter->next) {
name_node = doc.get_named_child(category_node_iter, "name");
name = name_node->get_content();
uppercats_node = doc.get_named_child(category_node_iter, "uppercats");
uppercats = (string)uppercats_node->get_content();
id_string = category_node_iter->get_prop("id");
+ id_map.set (id_string, name);
+
if (categories == null) {
categories = new Category[0];
}
categories += new Category(int.parse(id_string), name, uppercats);
}
+
// compute the display name for the categories
- // currently done by an unnecessary triple loop
- // one could make a loop that goes over the categories
- // and creates a list of back references cat_id -> index
- // but since cat_ids are not guaranteed to be continuous
- // that needs a perl hash ;-)
for(int i = 0; i < categories.length; i++) {
string[] upcatids = categories[i].uppercats.split(",");
var builder = new StringBuilder();
for (int j=0; j < upcatids.length; j++) {
builder.append ("/ ");
- // search for the upper category
- for (int k=0; k < categories.length; k++) {
- if (upcatids[j] == categories[k].id.to_string()) {
- builder.append (categories[k].name);
- break;
- }
- }
+ builder.append (id_map.get (upcatids[j]));
builder.append (" ");
}
categories[i].display_name = builder.str;
@@ -1005,158 +1003,148 @@ internal class Uploader : Publishing.RESTSupport.BatchUploader {
// UI elements
-internal class SSLErrorPane : Spit.Publishing.DialogPane, Object {
- private Gtk.Builder builder;
- private Gtk.Widget content;
+internal class SSLErrorPane : Shotwell.Plugins.Common.BuilderPane {
public signal void proceed ();
+ public string host { owned get; construct; }
+ public TlsCertificate cert { private get; construct; }
+ public string error_text { owned get; construct; }
public SSLErrorPane (SessionLoginTransaction transaction,
string host) {
- try {
- TlsCertificate cert;
- this.builder = new Gtk.Builder ();
- this.builder.add_from_resource (Resources.RESOURCE_PATH +
- "/piwigo_ssl_failure_pane.ui");
- this.content = this.builder.get_object ("content") as Gtk.Widget;
- var label = this.builder.get_object ("main_text") as Gtk.Label;
- // %s is the host name that we tried to connect to
- label.set_text (_("This does not look like the real <b>%s</b>. Attackers might be trying to steal or alter information going to or from this site (for example, private messages, credit card information, or passwords).").printf (host));
- label.use_markup = true;
-
- label = this.builder.get_object ("ssl_errors") as Gtk.Label;
- var text = transaction.detailed_error_from_tls_flags (out cert);
- label.set_text (text);
-
- var info = this.builder.get_object ("default") as Gtk.Button;
- info.clicked.connect (() => {
- var simple_cert = new Gcr.SimpleCertificate (cert.certificate.data);
- var widget = new Gcr.CertificateWidget (simple_cert);
-
- var dialog = new Gtk.Dialog ();
- dialog.get_content_area ().add (widget);
- dialog.add_button ("_OK", Gtk.ResponseType.OK);
- dialog.set_default_response (Gtk.ResponseType.OK);
- dialog.set_default_size (640, -1);
- dialog.show_all ();
- dialog.run ();
- dialog.destroy ();
- });
-
- var proceed = this.builder.get_object ("proceed_button") as Gtk.Button;
- proceed.clicked.connect (() => { this.proceed (); });
-
- if (this.content.parent != null) {
- this.content.parent.remove (this.content);
+ TlsCertificate cert;
+ var text = transaction.detailed_error_from_tls_flags (out cert);
+ Object (resource_path : Resources.RESOURCE_PATH +
+ "/piwigo_ssl_failure_pane.ui",
+ default_id: "default",
+ cert : cert,
+ error_text : text,
+ host : host);
+ }
+
+ public override void constructed () {
+ base.constructed ();
+
+ var label = this.get_builder ().get_object ("main_text") as Gtk.Label;
+ // %s is the host name that we tried to connect to
+ label.set_text (_("This does not look like the real <b>%s</b>. Attackers might be trying to steal or alter information going to or from this site (for example, private messages, credit card information, or passwords).").printf (host));
+ label.use_markup = true;
+
+ label = this.get_builder ().get_object ("ssl_errors") as Gtk.Label;
+ label.set_text (error_text);
+
+ var info = this.get_builder ().get_object ("default") as Gtk.Button;
+ info.clicked.connect (() => {
+ var simple_cert = new Gcr.SimpleCertificate (cert.certificate.data);
+ var widget = new Gcr.CertificateWidget (simple_cert);
+ bool use_header = true;
+ Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
+ var flags = (Gtk.DialogFlags) 0;
+ if (use_header) {
+ flags |= Gtk.DialogFlags.USE_HEADER_BAR;
}
- } catch (Error error) {
- warning ("Failed to create ui file: %s", error.message);
- assert_not_reached ();
- }
- }
- public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry () {
- return Spit.Publishing.DialogPane.GeometryOptions.NONE;
- }
-
- public Gtk.Widget get_widget () {
- return this.content;
- }
+ var dialog = new Gtk.Dialog.with_buttons (
+ _("Certificate of %s").printf (host),
+ null,
+ flags,
+ _("_OK"), Gtk.ResponseType.OK);
+ dialog.get_content_area ().add (widget);
+ dialog.set_default_response (Gtk.ResponseType.OK);
+ dialog.set_default_size (640, -1);
+ dialog.show_all ();
+ dialog.run ();
+ dialog.destroy ();
+ });
- public Gtk.Widget get_default_widget () {
- return this.builder.get_object ("default") as Gtk.Widget;
+ var proceed = this.get_builder ().get_object ("proceed_button") as Gtk.Button;
+ proceed.clicked.connect (() => { this.proceed (); });
}
-
- public void on_pane_installed () { }
-
- public void on_pane_uninstalled () { }
}
/**
* The authentication pane used when asking service URL, user name and password
* from the user.
*/
-internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
+internal class AuthenticationPane : Shotwell.Plugins.Common.BuilderPane {
public enum Mode {
INTRO,
FAILED_RETRY_URL,
FAILED_RETRY_USER
}
+
+ public Mode mode { get; construct; }
+ public unowned PiwigoPublisher publisher { get; construct; }
+
private static string INTRO_MESSAGE = _("Enter the URL of your Piwigo photo library as well as the username and password associated with your Piwigo account for that library.");
private static string FAILED_RETRY_URL_MESSAGE = _("Shotwell cannot contact your Piwigo photo library. Please verify the URL you entered");
private static string FAILED_RETRY_USER_MESSAGE = _("Username and/or password invalid. Please try again");
- private Gtk.Box pane_widget = null;
- private Gtk.Builder builder;
private Gtk.Entry url_entry;
private Gtk.Entry username_entry;
private Gtk.Entry password_entry;
- private Gtk.CheckButton remember_password_checkbutton;
+ private Gtk.Switch remember_password_checkbutton;
private Gtk.Button login_button;
public signal void login(string url, string user, string password, bool remember_password);
- public AuthenticationPane(PiwigoPublisher publisher, Mode mode = Mode.INTRO) {
- this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+ public AuthenticationPane (PiwigoPublisher publisher, Mode mode = Mode.INTRO) {
+ Object (resource_path : Resources.RESOURCE_PATH +
+ "/piwigo_authentication_pane.ui",
+ connect_signals : true,
+ default_id : "login_button",
+ mode : mode,
+ publisher : publisher);
+ }
- try {
- builder = new Gtk.Builder();
- builder.add_from_resource (Resources.RESOURCE_PATH + "/piwigo_authentication_pane.ui");
- builder.connect_signals(null);
- Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
-
- Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
- switch (mode) {
- case Mode.INTRO:
- message_label.set_text(INTRO_MESSAGE);
- break;
-
- case Mode.FAILED_RETRY_URL:
- message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
- "Invalid URL"), FAILED_RETRY_URL_MESSAGE));
- break;
-
- case Mode.FAILED_RETRY_USER:
- message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
- "Invalid User Name or Password"), FAILED_RETRY_USER_MESSAGE));
- break;
- }
+ public override void constructed () {
+ base.constructed ();
- url_entry = builder.get_object ("url_entry") as Gtk.Entry;
- string? persistent_url = publisher.get_persistent_url();
- if (persistent_url != null) {
- url_entry.set_text(persistent_url);
- }
- username_entry = builder.get_object ("username_entry") as Gtk.Entry;
- string? persistent_username = publisher.get_persistent_username();
- if (persistent_username != null) {
- username_entry.set_text(persistent_username);
- }
- password_entry = builder.get_object ("password_entry") as Gtk.Entry;
- string? persistent_password = publisher.get_persistent_password();
- if (persistent_password != null) {
- password_entry.set_text(persistent_password);
- }
- remember_password_checkbutton =
- builder.get_object ("remember_password_checkbutton") as Gtk.CheckButton;
- remember_password_checkbutton.set_active(publisher.get_remember_password());
+ var builder = this.get_builder ();
+ var message_label = builder.get_object("message_label") as Gtk.Label;
+ switch (mode) {
+ case Mode.INTRO:
+ message_label.set_text(INTRO_MESSAGE);
+ break;
- login_button = builder.get_object("login_button") as Gtk.Button;
+ case Mode.FAILED_RETRY_URL:
+ message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
+ "Invalid URL"), FAILED_RETRY_URL_MESSAGE));
+ break;
- username_entry.changed.connect(on_user_changed);
- url_entry.changed.connect(on_url_changed);
- password_entry.changed.connect(on_password_changed);
- login_button.clicked.connect(on_login_button_clicked);
+ case Mode.FAILED_RETRY_USER:
+ message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
+ "Invalid User Name or Password"), FAILED_RETRY_USER_MESSAGE));
+ break;
+ }
- align.reparent(pane_widget);
- publisher.get_host().set_dialog_default_widget(login_button);
- } catch (Error e) {
- warning("Could not load UI: %s", e.message);
+ url_entry = builder.get_object ("url_entry") as Gtk.Entry;
+ string? persistent_url = publisher.get_persistent_url();
+ if (persistent_url != null) {
+ url_entry.set_text(persistent_url);
}
- }
-
- public Gtk.Widget get_default_widget() {
- return login_button;
+ username_entry = builder.get_object ("username_entry") as Gtk.Entry;
+ string? persistent_username = publisher.get_persistent_username();
+ if (persistent_username != null) {
+ username_entry.set_text(persistent_username);
+ }
+ password_entry = builder.get_object ("password_entry") as Gtk.Entry;
+ string? persistent_password = publisher.get_persistent_password();
+ if (persistent_password != null) {
+ password_entry.set_text(persistent_password);
+ }
+ remember_password_checkbutton =
+ builder.get_object ("remember_password_checkbutton") as Gtk.Switch;
+ remember_password_checkbutton.set_active(publisher.get_remember_password());
+
+ login_button = builder.get_object("login_button") as Gtk.Button;
+
+ username_entry.changed.connect(on_user_changed);
+ url_entry.changed.connect(on_url_changed);
+ password_entry.changed.connect(on_password_changed);
+ login_button.clicked.connect(on_login_button_clicked);
+
+ publisher.get_host().set_dialog_default_widget(login_button);
}
private void on_login_button_clicked() {
@@ -1182,34 +1170,23 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
password_entry.text_length != 0);
}
- public Gtk.Widget get_widget() {
- return pane_widget;
- }
-
- public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
- return Spit.Publishing.DialogPane.GeometryOptions.NONE;
- }
-
- public void on_pane_installed() {
+ public override void on_pane_installed() {
+ base.on_pane_installed ();
+
url_entry.grab_focus();
password_entry.set_activates_default(true);
login_button.can_default = true;
update_login_button_sensitivity();
}
-
- public void on_pane_uninstalled() {
- }
}
/**
* The publishing options pane.
*/
-internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
+internal class PublishingOptionsPane : Shotwell.Plugins.Common.BuilderPane {
private static string DEFAULT_CATEGORY_NAME = _("Shotwell Connect");
- private Gtk.Box pane_widget = null;
- private Gtk.Builder builder;
private Gtk.RadioButton use_existing_radio;
private Gtk.RadioButton create_new_radio;
private Gtk.ComboBoxText existing_categories_combo;
@@ -1225,88 +1202,88 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
private Gtk.Button publish_button;
private Gtk.TextView album_comment;
private Gtk.Label album_comment_label;
-
- private Category[] existing_categories;
+
private PermissionLevel[] perm_levels;
private SizeEntry[] photo_sizes;
-
- private int last_category;
- private int last_permission_level;
- private int last_photo_size;
- private bool last_title_as_comment;
- private bool last_no_upload_tags;
+
+ public int last_category { private get; construct; }
+ public int last_permission_level { private get; construct; }
+ public int last_photo_size { private get; construct; }
+ public bool last_title_as_comment { private get; construct; }
+ public bool last_no_upload_tags { private get; construct; }
+ public bool strip_metadata_enabled { private get; construct; }
+ public Gee.List<Category> existing_categories { private get; construct; }
+ public string default_comment { private get; construct; }
public signal void publish(PublishingParameters parameters, bool strip_metadata);
public signal void logout();
- public PublishingOptionsPane(
- PiwigoPublisher publisher, Category[] categories,
- int last_category, int last_permission_level, int last_photo_size,
- bool last_title_as_comment, bool last_no_upload_tags, bool strip_metadata_enabled
- ) {
- this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
- this.last_category = last_category;
- this.last_permission_level = last_permission_level;
- this.last_photo_size = last_photo_size;
- this.last_title_as_comment = last_title_as_comment;
- this.last_no_upload_tags = last_no_upload_tags;
+ public PublishingOptionsPane(PiwigoPublisher publisher,
+ Category[] categories,
+ int last_category,
+ int last_permission_level,
+ int last_photo_size,
+ bool last_title_as_comment,
+ bool last_no_upload_tags,
+ bool strip_metadata_enabled) {
+ Object (resource_path : Resources.RESOURCE_PATH +
+ "/piwigo_publishing_options_pane.ui",
+ connect_signals : true,
+ default_id : "publish_button",
+ last_category : last_category,
+ last_permission_level : last_permission_level,
+ last_photo_size : last_photo_size,
+ last_title_as_comment : last_title_as_comment,
+ last_no_upload_tags : last_no_upload_tags,
+ strip_metadata_enabled : strip_metadata_enabled,
+ existing_categories : new Gee.ArrayList<Category>.wrap (categories,
+ Category.equal),
+ default_comment : get_common_comment_if_possible (publisher));
+ }
+
+ public override void constructed () {
+ base.constructed ();
+ var builder = this.get_builder ();
+
+ use_existing_radio = builder.get_object("use_existing_radio") as Gtk.RadioButton;
+ create_new_radio = builder.get_object("create_new_radio") as Gtk.RadioButton;
+ existing_categories_combo = builder.get_object("existing_categories_combo") as Gtk.ComboBoxText;
+ new_category_entry = builder.get_object ("new_category_entry") as Gtk.Entry;
+ within_existing_label = builder.get_object ("within_existing_label") as Gtk.Label;
+ within_existing_combo = builder.get_object ("within_existing_combo") as Gtk.ComboBoxText;
+
+ album_comment = builder.get_object ("album_comment") as Gtk.TextView;
+ album_comment.buffer = new Gtk.TextBuffer(null);
+ album_comment_label = builder.get_object ("album_comment_label") as Gtk.Label;
+
+ perms_combo = builder.get_object("perms_combo") as Gtk.ComboBoxText;
+ size_combo = builder.get_object("size_combo") as Gtk.ComboBoxText;
+
+ strip_metadata_check = builder.get_object("strip_metadata_check") as Gtk.CheckButton;
+ strip_metadata_check.set_active(strip_metadata_enabled);
+
+ title_as_comment_check = builder.get_object("title_as_comment_check") as Gtk.CheckButton;
+ title_as_comment_check.set_active(last_title_as_comment);
+
+ no_upload_tags_check = builder.get_object("no_upload_tags_check") as Gtk.CheckButton;
+ no_upload_tags_check.set_active(last_no_upload_tags);
+
+ logout_button = builder.get_object("logout_button") as Gtk.Button;
+ logout_button.clicked.connect(on_logout_button_clicked);
+
+ publish_button = builder.get_object("publish_button") as Gtk.Button;
+ publish_button.clicked.connect(on_publish_button_clicked);
+
+ use_existing_radio.clicked.connect(on_use_existing_radio_clicked);
+ create_new_radio.clicked.connect(on_create_new_radio_clicked);
+ new_category_entry.changed.connect(on_new_category_entry_changed);
+ within_existing_combo.changed.connect(on_existing_combo_changed);
- try {
- builder = new Gtk.Builder();
- builder.add_from_resource (Resources.RESOURCE_PATH + "/piwigo_publishing_options_pane.ui");
- builder.connect_signals(null);
- Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
-
- use_existing_radio = builder.get_object("use_existing_radio") as Gtk.RadioButton;
- create_new_radio = builder.get_object("create_new_radio") as Gtk.RadioButton;
- existing_categories_combo = builder.get_object("existing_categories_combo") as Gtk.ComboBoxText;
- new_category_entry = builder.get_object ("new_category_entry") as Gtk.Entry;
- within_existing_label = builder.get_object ("within_existing_label") as Gtk.Label;
- within_existing_combo = builder.get_object ("within_existing_combo") as Gtk.ComboBoxText;
-
- album_comment = builder.get_object ("album_comment") as Gtk.TextView;
- album_comment.buffer = new Gtk.TextBuffer(null);
- album_comment_label = builder.get_object ("album_comment_label") as Gtk.Label;
-
- perms_combo = builder.get_object("perms_combo") as Gtk.ComboBoxText;
- size_combo = builder.get_object("size_combo") as Gtk.ComboBoxText;
-
- strip_metadata_check = builder.get_object("strip_metadata_check") as Gtk.CheckButton;
- strip_metadata_check.set_active(strip_metadata_enabled);
-
- title_as_comment_check = builder.get_object("title_as_comment_check") as Gtk.CheckButton;
- title_as_comment_check.set_active(last_title_as_comment);
-
- no_upload_tags_check = builder.get_object("no_upload_tags_check") as Gtk.CheckButton;
- no_upload_tags_check.set_active(last_no_upload_tags);
-
- logout_button = builder.get_object("logout_button") as Gtk.Button;
- logout_button.clicked.connect(on_logout_button_clicked);
-
- publish_button = builder.get_object("publish_button") as Gtk.Button;
- publish_button.clicked.connect(on_publish_button_clicked);
-
- use_existing_radio.clicked.connect(on_use_existing_radio_clicked);
- create_new_radio.clicked.connect(on_create_new_radio_clicked);
- new_category_entry.changed.connect(on_new_category_entry_changed);
- within_existing_combo.changed.connect(on_existing_combo_changed);
-
- align.reparent(pane_widget);
- pane_widget.set_child_packing(align, true, true, 0, Gtk.PackType.START);
- } catch (Error e) {
- warning("Could not load UI: %s", e.message);
- }
-
- this.existing_categories = categories;
this.perm_levels = create_perm_levels();
this.photo_sizes = create_sizes();
- this.album_comment.buffer.set_text(get_common_comment_if_possible(publisher));
- }
-
- public Gtk.Widget get_default_widget() {
- return publish_button;
+ this.album_comment.buffer.set_text(this.default_comment);
}
-
+
private PermissionLevel[] create_perm_levels() {
PermissionLevel[] result = new PermissionLevel[0];
@@ -1410,16 +1387,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
)
);
}
-
- public Gtk.Widget get_widget() {
- return pane_widget;
- }
-
- public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
- return Spit.Publishing.DialogPane.GeometryOptions.NONE;
- }
-
- public void on_pane_installed() {
+
+ public override void on_pane_installed() {
+ base.on_pane_installed ();
+
create_categories_combo();
create_within_categories_combo();
create_permissions_combo();
@@ -1428,8 +1399,8 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
publish_button.can_default = true;
update_publish_button_sensitivity();
}
-
- private string get_common_comment_if_possible(PiwigoPublisher publisher) {
+
+ private static string get_common_comment_if_possible(PiwigoPublisher publisher) {
// we have to determine whether all the publishing items
// belong to the same event
Spit.Publishing.Publishable[] publishables = publisher.get_host().get_publishables();
@@ -1462,7 +1433,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
foreach (Category cat in existing_categories) {
existing_categories_combo.append_text(cat.display_name);
}
- if (existing_categories.length == 0) {
+ if (existing_categories.is_empty) {
// if no existing categories, disable the option to choose one
existing_categories_combo.set_sensitive(false);
use_existing_radio.set_sensitive(false);
@@ -1472,11 +1443,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
new_category_entry.grab_focus();
} else {
int last_category_index = find_category_index(last_category);
- if (last_category_index < 0) {
- existing_categories_combo.set_active(0);
- } else {
- existing_categories_combo.set_active(last_category_index);
- }
+ existing_categories_combo.set_active(last_category_index);
new_category_entry.set_sensitive(false);
album_comment.set_sensitive(false);
album_comment_label.set_sensitive(false);
@@ -1520,13 +1487,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
size_combo.set_active(last_size_index);
}
}
-
- public void on_pane_uninstalled() {
- }
-
+
private int find_category_index(int category_id) {
- int result = -1;
- for(int i = 0; i < existing_categories.length; i++) {
+ int result = 0;
+ for(int i = 0; i < existing_categories.size; i++) {
if (existing_categories[i].id == category_id) {
result = i;
break;
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index b1f6d33..f1adc38 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -294,7 +294,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
static const gchar* you_tube_service_real_get_id (SpitPluggable* base);
static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base);
static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length);
static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
@@ -438,8 +438,10 @@ enum {
PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static guint8* _vala_array_dup11 (guint8* self, int length);
static void _vala_SoupBuffer_free (SoupBuffer* self);
static void _vala_SoupMultipart_free (SoupMultipart* self);
+static guint8* _vala_array_dup12 (guint8* self, int length);
static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
#define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate))
enum {
@@ -465,7 +467,7 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
_tmp0__length1 = you_tube_service_icon_pixbuf_set_length1;
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_tmp0_ == NULL) {
-#line 447 "YouTubePublishing.c"
+#line 449 "YouTubePublishing.c"
gint _tmp1_ = 0;
GdkPixbuf** _tmp2_ = NULL;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -478,18 +480,18 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
you_tube_service_icon_pixbuf_set_length1 = _tmp1_;
#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1;
-#line 460 "YouTubePublishing.c"
+#line 462 "YouTubePublishing.c"
}
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 464 "YouTubePublishing.c"
+#line 466 "YouTubePublishing.c"
}
YouTubeService* you_tube_service_new (GFile* resource_directory) {
#line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory);
-#line 471 "YouTubePublishing.c"
+#line 473 "YouTubePublishing.c"
}
@@ -511,7 +513,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
result = _tmp2_;
#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 493 "YouTubePublishing.c"
+#line 495 "YouTubePublishing.c"
}
@@ -524,7 +526,7 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.youtube";
#line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 506 "YouTubePublishing.c"
+#line 508 "YouTubePublishing.c"
}
@@ -537,35 +539,35 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas
result = "YouTube";
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 519 "YouTubePublishing.c"
+#line 521 "YouTubePublishing.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 526 "YouTubePublishing.c"
+#line 528 "YouTubePublishing.c"
}
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
GdkPixbuf** result;
int i;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
result = g_new0 (GdkPixbuf*, length + 1);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
for (i = 0; i < length; i++) {
-#line 537 "YouTubePublishing.c"
+#line 539 "YouTubePublishing.c"
GdkPixbuf* _tmp0_ = NULL;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp0_ = _g_object_ref0 (self[i]);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
result[i] = _tmp0_;
-#line 543 "YouTubePublishing.c"
+#line 545 "YouTubePublishing.c"
}
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 547 "YouTubePublishing.c"
+#line 549 "YouTubePublishing.c"
}
@@ -638,7 +640,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp8__length1 = you_tube_service_icon_pixbuf_set_length1;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup9 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+ _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp9__length1 = _tmp8__length1;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -647,7 +649,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
(*info).icons = _tmp9_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*info).icons_length1 = _tmp9__length1;
-#line 629 "YouTubePublishing.c"
+#line 631 "YouTubePublishing.c"
}
@@ -668,7 +670,7 @@ static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPubl
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 650 "YouTubePublishing.c"
+#line 652 "YouTubePublishing.c"
}
@@ -681,7 +683,7 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 663 "YouTubePublishing.c"
+#line 665 "YouTubePublishing.c"
}
@@ -689,7 +691,7 @@ static void you_tube_service_real_activation (SpitPluggable* base, gboolean enab
YouTubeService * self;
#line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
-#line 671 "YouTubePublishing.c"
+#line 673 "YouTubePublishing.c"
}
@@ -698,7 +700,7 @@ static void you_tube_service_class_init (YouTubeServiceClass * klass) {
you_tube_service_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize;
-#line 680 "YouTubePublishing.c"
+#line 682 "YouTubePublishing.c"
}
@@ -715,7 +717,7 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface *
iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) you_tube_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->activation = (void (*)(SpitPluggable*, gboolean)) you_tube_service_real_activation;
-#line 697 "YouTubePublishing.c"
+#line 699 "YouTubePublishing.c"
}
@@ -726,7 +728,7 @@ static void you_tube_service_spit_publishing_service_interface_init (SpitPublish
iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) you_tube_service_real_get_supported_media;
-#line 708 "YouTubePublishing.c"
+#line 710 "YouTubePublishing.c"
}
@@ -740,7 +742,7 @@ static void you_tube_service_finalize (GObject* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj);
-#line 722 "YouTubePublishing.c"
+#line 724 "YouTubePublishing.c"
}
@@ -788,14 +790,14 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters
self->priv->user_name = NULL;
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 770 "YouTubePublishing.c"
+#line 772 "YouTubePublishing.c"
}
PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) {
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS);
-#line 777 "YouTubePublishing.c"
+#line 779 "YouTubePublishing.c"
}
@@ -810,7 +812,7 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr
result = _tmp0_;
#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 792 "YouTubePublishing.c"
+#line 794 "YouTubePublishing.c"
}
@@ -822,7 +824,7 @@ void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePub
_tmp0_ = privacy;
#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->privacy = _tmp0_;
-#line 804 "YouTubePublishing.c"
+#line 806 "YouTubePublishing.c"
}
@@ -840,7 +842,7 @@ gchar* publishing_you_tube_publishing_parameters_get_channel_name (PublishingYou
result = _tmp1_;
#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 822 "YouTubePublishing.c"
+#line 824 "YouTubePublishing.c"
}
@@ -857,7 +859,7 @@ void publishing_you_tube_publishing_parameters_set_channel_name (PublishingYouTu
_g_free0 (self->priv->channel_name);
#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->channel_name = _tmp1_;
-#line 839 "YouTubePublishing.c"
+#line 841 "YouTubePublishing.c"
}
@@ -875,7 +877,7 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub
result = _tmp1_;
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 857 "YouTubePublishing.c"
+#line 859 "YouTubePublishing.c"
}
@@ -892,14 +894,14 @@ void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubeP
_g_free0 (self->priv->user_name);
#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->user_name = _tmp1_;
-#line 874 "YouTubePublishing.c"
+#line 876 "YouTubePublishing.c"
}
static void publishing_you_tube_value_publishing_parameters_init (GValue* value) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 881 "YouTubePublishing.c"
+#line 883 "YouTubePublishing.c"
}
@@ -908,7 +910,7 @@ static void publishing_you_tube_value_publishing_parameters_free_value (GValue*
if (value->data[0].v_pointer) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer);
-#line 890 "YouTubePublishing.c"
+#line 892 "YouTubePublishing.c"
}
}
@@ -918,11 +920,11 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV
if (src_value->data[0].v_pointer) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 900 "YouTubePublishing.c"
+#line 902 "YouTubePublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 904 "YouTubePublishing.c"
+#line 906 "YouTubePublishing.c"
}
}
@@ -930,37 +932,37 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV
static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 912 "YouTubePublishing.c"
+#line 914 "YouTubePublishing.c"
}
static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 919 "YouTubePublishing.c"
+#line 921 "YouTubePublishing.c"
PublishingYouTubePublishingParameters* object;
object = collect_values[0].v_pointer;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 926 "YouTubePublishing.c"
+#line 928 "YouTubePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 930 "YouTubePublishing.c"
+#line 932 "YouTubePublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object);
-#line 934 "YouTubePublishing.c"
+#line 936 "YouTubePublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 938 "YouTubePublishing.c"
+#line 940 "YouTubePublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 942 "YouTubePublishing.c"
+#line 944 "YouTubePublishing.c"
}
@@ -971,25 +973,25 @@ static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const
if (!object_p) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 953 "YouTubePublishing.c"
+#line 955 "YouTubePublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!value->data[0].v_pointer) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = NULL;
-#line 959 "YouTubePublishing.c"
+#line 961 "YouTubePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 963 "YouTubePublishing.c"
+#line 965 "YouTubePublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 967 "YouTubePublishing.c"
+#line 969 "YouTubePublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 971 "YouTubePublishing.c"
+#line 973 "YouTubePublishing.c"
}
@@ -1003,7 +1005,7 @@ GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* n
G_PARAM_SPEC (spec)->value_type = object_type;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 985 "YouTubePublishing.c"
+#line 987 "YouTubePublishing.c"
}
@@ -1012,7 +1014,7 @@ gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* valu
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 994 "YouTubePublishing.c"
+#line 996 "YouTubePublishing.c"
}
@@ -1032,17 +1034,17 @@ void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointe
value->data[0].v_pointer = v_object;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1014 "YouTubePublishing.c"
+#line 1016 "YouTubePublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1018 "YouTubePublishing.c"
+#line 1020 "YouTubePublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_unref (old);
-#line 1024 "YouTubePublishing.c"
+#line 1026 "YouTubePublishing.c"
}
}
@@ -1061,17 +1063,17 @@ void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpoint
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1043 "YouTubePublishing.c"
+#line 1045 "YouTubePublishing.c"
} else {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1047 "YouTubePublishing.c"
+#line 1049 "YouTubePublishing.c"
}
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_parameters_unref (old);
-#line 1053 "YouTubePublishing.c"
+#line 1055 "YouTubePublishing.c"
}
}
@@ -1083,7 +1085,7 @@ static void publishing_you_tube_publishing_parameters_class_init (PublishingYouT
((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate));
-#line 1065 "YouTubePublishing.c"
+#line 1067 "YouTubePublishing.c"
}
@@ -1092,7 +1094,7 @@ static void publishing_you_tube_publishing_parameters_instance_init (PublishingY
self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->ref_count = 1;
-#line 1074 "YouTubePublishing.c"
+#line 1076 "YouTubePublishing.c"
}
@@ -1106,7 +1108,7 @@ static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTub
_g_free0 (self->priv->channel_name);
#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (self->priv->user_name);
-#line 1088 "YouTubePublishing.c"
+#line 1090 "YouTubePublishing.c"
}
@@ -1131,7 +1133,7 @@ gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return instance;
-#line 1113 "YouTubePublishing.c"
+#line 1115 "YouTubePublishing.c"
}
@@ -1144,7 +1146,7 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1126 "YouTubePublishing.c"
+#line 1128 "YouTubePublishing.c"
}
}
@@ -1198,14 +1200,14 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 1180 "YouTubePublishing.c"
+#line 1182 "YouTubePublishing.c"
}
PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host);
-#line 1187 "YouTubePublishing.c"
+#line 1189 "YouTubePublishing.c"
}
@@ -1221,7 +1223,7 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi
result = _tmp0_;
#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 1203 "YouTubePublishing.c"
+#line 1205 "YouTubePublishing.c"
}
@@ -1239,7 +1241,7 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
if (_tmp0_) {
#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1221 "YouTubePublishing.c"
+#line 1223 "YouTubePublishing.c"
}
#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->running = TRUE;
@@ -1249,14 +1251,14 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
if (_tmp1_ == NULL) {
#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 1231 "YouTubePublishing.c"
+#line 1233 "YouTubePublishing.c"
} else {
const gchar* _tmp2_ = NULL;
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp2_ = self->priv->refresh_token;
#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 1238 "YouTubePublishing.c"
+#line 1240 "YouTubePublishing.c"
}
}
@@ -1279,7 +1281,7 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp
publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1261 "YouTubePublishing.c"
+#line 1263 "YouTubePublishing.c"
}
@@ -1306,7 +1308,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp2_ = _tmp1_->name;
#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1288 "YouTubePublishing.c"
+#line 1290 "YouTubePublishing.c"
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1315,7 +1317,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp4_ = _tmp3_->children;
#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
doc_node_iter = _tmp4_;
-#line 1297 "YouTubePublishing.c"
+#line 1299 "YouTubePublishing.c"
} else {
xmlNode* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -1325,13 +1327,13 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp6_ = _tmp5_->name;
#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1307 "YouTubePublishing.c"
+#line 1309 "YouTubePublishing.c"
xmlNode* _tmp7_ = NULL;
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp7_ = document_root;
#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
doc_node_iter = _tmp7_;
-#line 1313 "YouTubePublishing.c"
+#line 1315 "YouTubePublishing.c"
} else {
GError* _tmp8_ = NULL;
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1346,7 +1348,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_g_free0 (_result_);
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 1328 "YouTubePublishing.c"
+#line 1330 "YouTubePublishing.c"
} else {
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (_result_);
@@ -1356,7 +1358,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
g_clear_error (&_inner_error_);
#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 1338 "YouTubePublishing.c"
+#line 1340 "YouTubePublishing.c"
}
}
}
@@ -1366,7 +1368,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp9_ = TRUE;
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
while (TRUE) {
-#line 1348 "YouTubePublishing.c"
+#line 1350 "YouTubePublishing.c"
xmlNode* _tmp12_ = NULL;
xmlNode* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
@@ -1379,7 +1381,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
gchar* _tmp33_ = NULL;
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!_tmp9_) {
-#line 1361 "YouTubePublishing.c"
+#line 1363 "YouTubePublishing.c"
xmlNode* _tmp10_ = NULL;
xmlNode* _tmp11_ = NULL;
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1388,7 +1390,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp11_ = _tmp10_->next;
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
doc_node_iter = _tmp11_;
-#line 1370 "YouTubePublishing.c"
+#line 1372 "YouTubePublishing.c"
}
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp9_ = FALSE;
@@ -1398,7 +1400,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
if (!(_tmp12_ != NULL)) {
#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
break;
-#line 1380 "YouTubePublishing.c"
+#line 1382 "YouTubePublishing.c"
}
#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp13_ = doc_node_iter;
@@ -1408,7 +1410,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
if (g_strcmp0 (_tmp14_, "entry") != 0) {
#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
continue;
-#line 1390 "YouTubePublishing.c"
+#line 1392 "YouTubePublishing.c"
}
#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
name_val = NULL;
@@ -1420,20 +1422,20 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp16_ = _tmp15_->children;
#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
channel_node_iter = _tmp16_;
-#line 1402 "YouTubePublishing.c"
+#line 1404 "YouTubePublishing.c"
{
gboolean _tmp17_ = FALSE;
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp17_ = TRUE;
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
while (TRUE) {
-#line 1409 "YouTubePublishing.c"
+#line 1411 "YouTubePublishing.c"
xmlNode* _tmp20_ = NULL;
xmlNode* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!_tmp17_) {
-#line 1415 "YouTubePublishing.c"
+#line 1417 "YouTubePublishing.c"
xmlNode* _tmp18_ = NULL;
xmlNode* _tmp19_ = NULL;
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1442,7 +1444,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp19_ = _tmp18_->next;
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
channel_node_iter = _tmp19_;
-#line 1424 "YouTubePublishing.c"
+#line 1426 "YouTubePublishing.c"
}
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp17_ = FALSE;
@@ -1452,7 +1454,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
if (!(_tmp20_ != NULL)) {
#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
break;
-#line 1434 "YouTubePublishing.c"
+#line 1436 "YouTubePublishing.c"
}
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp21_ = channel_node_iter;
@@ -1460,7 +1462,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp22_ = _tmp21_->name;
#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1442 "YouTubePublishing.c"
+#line 1444 "YouTubePublishing.c"
xmlNode* _tmp23_ = NULL;
gchar* _tmp24_ = NULL;
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1471,7 +1473,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_g_free0 (name_val);
#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
name_val = _tmp24_;
-#line 1453 "YouTubePublishing.c"
+#line 1455 "YouTubePublishing.c"
} else {
xmlNode* _tmp25_ = NULL;
const gchar* _tmp26_ = NULL;
@@ -1481,7 +1483,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_tmp26_ = _tmp25_->name;
#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1463 "YouTubePublishing.c"
+#line 1465 "YouTubePublishing.c"
xmlNode* _tmp27_ = NULL;
xmlNs* _tmp28_ = NULL;
const gchar* _tmp29_ = NULL;
@@ -1497,7 +1499,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
if (_tmp29_ != NULL) {
#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
continue;
-#line 1479 "YouTubePublishing.c"
+#line 1481 "YouTubePublishing.c"
}
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp30_ = channel_node_iter;
@@ -1507,7 +1509,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_g_free0 (url_val);
#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
url_val = _tmp31_;
-#line 1489 "YouTubePublishing.c"
+#line 1491 "YouTubePublishing.c"
}
}
}
@@ -1526,7 +1528,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
_g_free0 (name_val);
#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
break;
-#line 1508 "YouTubePublishing.c"
+#line 1510 "YouTubePublishing.c"
}
}
#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1538,7 +1540,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
result = _result_;
#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 1519 "YouTubePublishing.c"
+#line 1521 "YouTubePublishing.c"
}
@@ -1556,13 +1558,13 @@ static void publishing_you_tube_you_tube_publisher_on_service_welcome_login (Pub
if (!_tmp0_) {
#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1536 "YouTubePublishing.c"
+#line 1538 "YouTubePublishing.c"
}
#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp1_ = self->priv->refresh_token;
#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1542 "YouTubePublishing.c"
+#line 1544 "YouTubePublishing.c"
}
@@ -1616,21 +1618,21 @@ static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (
_publishing_rest_support_session_unref0 (_tmp7_);
#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_fetch_account_information (self);
-#line 1596 "YouTubePublishing.c"
+#line 1598 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete ((PublishingYouTubeYouTubePublisher*) self, _sender);
-#line 1603 "YouTubePublishing.c"
+#line 1605 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1610 "YouTubePublishing.c"
+#line 1612 "YouTubePublishing.c"
}
@@ -1666,13 +1668,13 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_comp
if (!_tmp4_) {
#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1645 "YouTubePublishing.c"
+#line 1647 "YouTubePublishing.c"
}
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp5_ = txn;
#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction));
-#line 1651 "YouTubePublishing.c"
+#line 1653 "YouTubePublishing.c"
}
@@ -1720,7 +1722,7 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_erro
if (!_tmp7_) {
#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1698 "YouTubePublishing.c"
+#line 1700 "YouTubePublishing.c"
}
#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -1728,7 +1730,7 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_erro
_tmp9_ = err;
#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 1706 "YouTubePublishing.c"
+#line 1708 "YouTubePublishing.c"
}
@@ -1745,11 +1747,11 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout
if (!_tmp0_) {
#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1722 "YouTubePublishing.c"
+#line 1724 "YouTubePublishing.c"
}
#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1726 "YouTubePublishing.c"
+#line 1728 "YouTubePublishing.c"
}
@@ -1766,11 +1768,11 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish
if (!_tmp0_) {
#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1742 "YouTubePublishing.c"
+#line 1744 "YouTubePublishing.c"
}
#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1746 "YouTubePublishing.c"
+#line 1748 "YouTubePublishing.c"
}
@@ -1802,7 +1804,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
if (!_tmp2_) {
#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1777 "YouTubePublishing.c"
+#line 1779 "YouTubePublishing.c"
}
#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp3_ = self->priv->progress_reporter;
@@ -1814,21 +1816,21 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
_tmp5_ = completed_fraction;
#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1789 "YouTubePublishing.c"
+#line 1791 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published);
-#line 1796 "YouTubePublishing.c"
+#line 1798 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1803 "YouTubePublishing.c"
+#line 1805 "YouTubePublishing.c"
}
@@ -1866,11 +1868,11 @@ static void publishing_you_tube_you_tube_publisher_on_upload_complete (Publishin
if (!_tmp5_) {
#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1840 "YouTubePublishing.c"
+#line 1842 "YouTubePublishing.c"
}
#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_show_success_pane (self);
-#line 1844 "YouTubePublishing.c"
+#line 1846 "YouTubePublishing.c"
}
@@ -1906,7 +1908,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
if (!_tmp4_) {
#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1880 "YouTubePublishing.c"
+#line 1882 "YouTubePublishing.c"
}
#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp5_ = err;
@@ -1921,14 +1923,14 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
_tmp8_ = err;
#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1894 "YouTubePublishing.c"
+#line 1896 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_service_welcome_login ((PublishingYouTubeYouTubePublisher*) self);
-#line 1901 "YouTubePublishing.c"
+#line 1903 "YouTubePublishing.c"
}
@@ -1942,7 +1944,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane
_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_YOU_TUBE_SERVICE_WELCOME_MESSAGE, _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 1915 "YouTubePublishing.c"
+#line 1917 "YouTubePublishing.c"
}
@@ -1983,7 +1985,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1956 "YouTubePublishing.c"
+#line 1958 "YouTubePublishing.c"
{
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1991,7 +1993,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1964 "YouTubePublishing.c"
+#line 1966 "YouTubePublishing.c"
goto __catch27_spit_publishing_publishing_error;
}
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2002,7 +2004,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
g_clear_error (&_inner_error_);
#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 1975 "YouTubePublishing.c"
+#line 1977 "YouTubePublishing.c"
}
}
goto __finally27;
@@ -2020,7 +2022,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_error_free0 (err);
-#line 1993 "YouTubePublishing.c"
+#line 1995 "YouTubePublishing.c"
}
__finally27:
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2033,11 +2035,11 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
g_clear_error (&_inner_error_);
#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2006 "YouTubePublishing.c"
+#line 2008 "YouTubePublishing.c"
}
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2010 "YouTubePublishing.c"
+#line 2012 "YouTubePublishing.c"
}
@@ -2046,7 +2048,7 @@ static gchar* _publishing_you_tube_you_tube_publisher_channel_directory_transact
result = publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (doc);
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 2019 "YouTubePublishing.c"
+#line 2021 "YouTubePublishing.c"
}
@@ -2060,7 +2062,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_debug ("YouTubePublishing.vala:329: ACTION: extracting account and channel inf" \
"ormation from body of server response");
-#line 2032 "YouTubePublishing.c"
+#line 2034 "YouTubePublishing.c"
{
PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp1_ = NULL;
@@ -2087,7 +2089,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2059 "YouTubePublishing.c"
+#line 2061 "YouTubePublishing.c"
goto __catch28_spit_publishing_publishing_error;
}
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2098,7 +2100,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
g_clear_error (&_inner_error_);
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2070 "YouTubePublishing.c"
+#line 2072 "YouTubePublishing.c"
}
#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp6_ = _tmp0_;
@@ -2110,7 +2112,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
response_doc = _tmp6_;
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2082 "YouTubePublishing.c"
+#line 2084 "YouTubePublishing.c"
}
goto __finally28;
__catch28_spit_publishing_publishing_error:
@@ -2134,7 +2136,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2106 "YouTubePublishing.c"
+#line 2108 "YouTubePublishing.c"
}
__finally28:
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2147,7 +2149,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
g_clear_error (&_inner_error_);
#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2119 "YouTubePublishing.c"
+#line 2121 "YouTubePublishing.c"
}
{
gchar* _tmp9_ = NULL;
@@ -2167,7 +2169,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2139 "YouTubePublishing.c"
+#line 2141 "YouTubePublishing.c"
goto __catch29_spit_publishing_publishing_error;
}
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2178,7 +2180,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
g_clear_error (&_inner_error_);
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2150 "YouTubePublishing.c"
+#line 2152 "YouTubePublishing.c"
}
#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp13_ = self->priv->publishing_parameters;
@@ -2186,7 +2188,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
publishing_you_tube_publishing_parameters_set_channel_name (_tmp13_, _tmp9_);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (_tmp9_);
-#line 2158 "YouTubePublishing.c"
+#line 2160 "YouTubePublishing.c"
}
goto __finally29;
__catch29_spit_publishing_publishing_error:
@@ -2210,7 +2212,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
_publishing_rest_support_xml_document_unref0 (response_doc);
#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2182 "YouTubePublishing.c"
+#line 2184 "YouTubePublishing.c"
}
__finally29:
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2223,27 +2225,27 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
g_clear_error (&_inner_error_);
#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2195 "YouTubePublishing.c"
+#line 2197 "YouTubePublishing.c"
}
#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2201 "YouTubePublishing.c"
+#line 2203 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self);
-#line 2208 "YouTubePublishing.c"
+#line 2210 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self);
-#line 2215 "YouTubePublishing.c"
+#line 2217 "YouTubePublishing.c"
}
@@ -2269,7 +2271,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
_tmp0_ = gtk_builder_new ();
#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
builder = _tmp0_;
-#line 2241 "YouTubePublishing.c"
+#line 2243 "YouTubePublishing.c"
{
GtkBuilder* _tmp1_ = NULL;
#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2278,7 +2280,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_);
#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2250 "YouTubePublishing.c"
+#line 2252 "YouTubePublishing.c"
goto __catch30_g_error;
}
}
@@ -2321,7 +2323,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
_g_object_unref0 (builder);
#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2292 "YouTubePublishing.c"
+#line 2294 "YouTubePublishing.c"
}
__finally30:
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2334,7 +2336,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
g_clear_error (&_inner_error_);
#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2305 "YouTubePublishing.c"
+#line 2307 "YouTubePublishing.c"
}
#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -2368,14 +2370,14 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
_g_object_unref0 (opts_pane);
#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (builder);
-#line 2339 "YouTubePublishing.c"
+#line 2341 "YouTubePublishing.c"
}
static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete);
-#line 2346 "YouTubePublishing.c"
+#line 2348 "YouTubePublishing.c"
}
@@ -2441,7 +2443,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
if (!_tmp6_) {
#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 2411 "YouTubePublishing.c"
+#line 2413 "YouTubePublishing.c"
}
#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -2487,7 +2489,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
_publishing_rest_support_batch_uploader_unref0 (uploader);
#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2457 "YouTubePublishing.c"
+#line 2459 "YouTubePublishing.c"
}
@@ -2506,7 +2508,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_success_pane (Publish
_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2476 "YouTubePublishing.c"
+#line 2478 "YouTubePublishing.c"
}
@@ -2537,7 +2539,7 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES
spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 2507 "YouTubePublishing.c"
+#line 2509 "YouTubePublishing.c"
}
@@ -2552,14 +2554,14 @@ static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_
self = (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 2522 "YouTubePublishing.c"
+#line 2524 "YouTubePublishing.c"
}
static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, session);
-#line 2529 "YouTubePublishing.c"
+#line 2531 "YouTubePublishing.c"
}
@@ -2587,7 +2589,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
if (g_strcmp0 (_tmp4_, "feed") == 0) {
#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp2_ = TRUE;
-#line 2557 "YouTubePublishing.c"
+#line 2559 "YouTubePublishing.c"
} else {
xmlNode* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -2597,7 +2599,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
_tmp6_ = _tmp5_->name;
#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 2567 "YouTubePublishing.c"
+#line 2569 "YouTubePublishing.c"
}
#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_tmp2_) {
@@ -2605,7 +2607,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
result = NULL;
#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 2575 "YouTubePublishing.c"
+#line 2577 "YouTubePublishing.c"
} else {
gchar* _tmp7_ = NULL;
#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2614,7 +2616,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
result = _tmp7_;
#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 2584 "YouTubePublishing.c"
+#line 2586 "YouTubePublishing.c"
}
}
@@ -2622,7 +2624,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
static void publishing_you_tube_you_tube_publisher_channel_directory_transaction_class_init (PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass * klass) {
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_you_tube_publisher_channel_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2592 "YouTubePublishing.c"
+#line 2594 "YouTubePublishing.c"
}
@@ -2659,14 +2661,14 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube
((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_you_tube_you_tube_publisher_real_do_logout;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize;
-#line 2629 "YouTubePublishing.c"
+#line 2631 "YouTubePublishing.c"
}
static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) {
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self);
-#line 2636 "YouTubePublishing.c"
+#line 2638 "YouTubePublishing.c"
}
@@ -2688,7 +2690,7 @@ static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) {
self->priv->progress_reporter_target_destroy_notify = NULL;
#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj);
-#line 2658 "YouTubePublishing.c"
+#line 2660 "YouTubePublishing.c"
}
@@ -2707,28 +2709,28 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) {
static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) {
#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL;
-#line 2677 "YouTubePublishing.c"
+#line 2679 "YouTubePublishing.c"
}
static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) {
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 2684 "YouTubePublishing.c"
+#line 2686 "YouTubePublishing.c"
}
static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2691 "YouTubePublishing.c"
+#line 2693 "YouTubePublishing.c"
}
static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2698 "YouTubePublishing.c"
+#line 2700 "YouTubePublishing.c"
}
@@ -2951,7 +2953,7 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
_tmp46_ = self->priv->privacy_descriptions;
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp46__length1 = self->priv->privacy_descriptions_length1;
-#line 2921 "YouTubePublishing.c"
+#line 2923 "YouTubePublishing.c"
{
PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
gint desc_collection_length1 = 0;
@@ -2963,14 +2965,14 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
desc_collection_length1 = _tmp46__length1;
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
for (desc_it = 0; desc_it < _tmp46__length1; desc_it = desc_it + 1) {
-#line 2933 "YouTubePublishing.c"
+#line 2935 "YouTubePublishing.c"
PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp47_ = NULL;
PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL;
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp47_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
desc = _tmp47_;
-#line 2940 "YouTubePublishing.c"
+#line 2942 "YouTubePublishing.c"
{
GtkComboBoxText* _tmp48_ = NULL;
PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp49_ = NULL;
@@ -2985,7 +2987,7 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
gtk_combo_box_text_append_text (_tmp48_, _tmp50_);
#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc);
-#line 2955 "YouTubePublishing.c"
+#line 2957 "YouTubePublishing.c"
}
}
}
@@ -3009,14 +3011,14 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 2979 "YouTubePublishing.c"
+#line 2981 "YouTubePublishing.c"
}
PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, host, builder, publishing_parameters);
-#line 2986 "YouTubePublishing.c"
+#line 2988 "YouTubePublishing.c"
}
@@ -3048,7 +3050,7 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ
publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_);
#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_signal_emit_by_name (self, "publish");
-#line 3018 "YouTubePublishing.c"
+#line 3020 "YouTubePublishing.c"
}
@@ -3057,7 +3059,7 @@ static void publishing_you_tube_publishing_options_pane_on_logout_clicked (Publi
g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_signal_emit_by_name (self, "logout");
-#line 3027 "YouTubePublishing.c"
+#line 3029 "YouTubePublishing.c"
}
@@ -3069,7 +3071,7 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se
_tmp0_ = self->priv->publish_button;
#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3039 "YouTubePublishing.c"
+#line 3041 "YouTubePublishing.c"
}
@@ -3080,13 +3082,13 @@ static void _vala_array_add31 (PublishingYouTubePublishingOptionsPanePrivacyDesc
*size = (*size) ? (2 * (*size)) : 4;
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3050 "YouTubePublishing.c"
+#line 3052 "YouTubePublishing.c"
}
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[(*length)++] = value;
#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[*length] = NULL;
-#line 3056 "YouTubePublishing.c"
+#line 3058 "YouTubePublishing.c"
}
@@ -3097,13 +3099,13 @@ static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDesc
*size = (*size) ? (2 * (*size)) : 4;
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3067 "YouTubePublishing.c"
+#line 3069 "YouTubePublishing.c"
}
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[(*length)++] = value;
#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[*length] = NULL;
-#line 3073 "YouTubePublishing.c"
+#line 3075 "YouTubePublishing.c"
}
@@ -3114,13 +3116,13 @@ static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDesc
*size = (*size) ? (2 * (*size)) : 4;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3084 "YouTubePublishing.c"
+#line 3086 "YouTubePublishing.c"
}
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[(*length)++] = value;
#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
(*array)[*length] = NULL;
-#line 3090 "YouTubePublishing.c"
+#line 3092 "YouTubePublishing.c"
}
@@ -3192,13 +3194,13 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
if (result_length1) {
#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*result_length1 = _tmp10__length1;
-#line 3162 "YouTubePublishing.c"
+#line 3164 "YouTubePublishing.c"
}
#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
result = _tmp10_;
#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 3168 "YouTubePublishing.c"
+#line 3170 "YouTubePublishing.c"
}
@@ -3222,7 +3224,7 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S
result = _tmp2_;
#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 3192 "YouTubePublishing.c"
+#line 3194 "YouTubePublishing.c"
}
@@ -3235,7 +3237,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_op
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 3205 "YouTubePublishing.c"
+#line 3207 "YouTubePublishing.c"
}
@@ -3245,7 +3247,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 3215 "YouTubePublishing.c"
+#line 3217 "YouTubePublishing.c"
}
@@ -3253,7 +3255,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled
PublishingYouTubePublishingOptionsPane * self;
#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 3223 "YouTubePublishing.c"
+#line 3225 "YouTubePublishing.c"
}
@@ -3280,21 +3282,21 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_
self->privacy_setting = _tmp2_;
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 3250 "YouTubePublishing.c"
+#line 3252 "YouTubePublishing.c"
}
static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 3257 "YouTubePublishing.c"
+#line 3259 "YouTubePublishing.c"
}
static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3264 "YouTubePublishing.c"
+#line 3266 "YouTubePublishing.c"
}
@@ -3303,7 +3305,7 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
if (value->data[0].v_pointer) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 3273 "YouTubePublishing.c"
+#line 3275 "YouTubePublishing.c"
}
}
@@ -3313,11 +3315,11 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
if (src_value->data[0].v_pointer) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 3283 "YouTubePublishing.c"
+#line 3285 "YouTubePublishing.c"
} else {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3287 "YouTubePublishing.c"
+#line 3289 "YouTubePublishing.c"
}
}
@@ -3325,37 +3327,37 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 3295 "YouTubePublishing.c"
+#line 3297 "YouTubePublishing.c"
}
static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (collect_values[0].v_pointer) {
-#line 3302 "YouTubePublishing.c"
+#line 3304 "YouTubePublishing.c"
PublishingYouTubePublishingOptionsPanePrivacyDescription* object;
object = collect_values[0].v_pointer;
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (object->parent_instance.g_class == NULL) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3309 "YouTubePublishing.c"
+#line 3311 "YouTubePublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 3313 "YouTubePublishing.c"
+#line 3315 "YouTubePublishing.c"
}
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object);
-#line 3317 "YouTubePublishing.c"
+#line 3319 "YouTubePublishing.c"
} else {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3321 "YouTubePublishing.c"
+#line 3323 "YouTubePublishing.c"
}
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 3325 "YouTubePublishing.c"
+#line 3327 "YouTubePublishing.c"
}
@@ -3366,25 +3368,25 @@ static gchar* publishing_you_tube_publishing_options_pane_value_privacy_descript
if (!object_p) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3336 "YouTubePublishing.c"
+#line 3338 "YouTubePublishing.c"
}
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (!value->data[0].v_pointer) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = NULL;
-#line 3342 "YouTubePublishing.c"
+#line 3344 "YouTubePublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 3346 "YouTubePublishing.c"
+#line 3348 "YouTubePublishing.c"
} else {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
*object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3350 "YouTubePublishing.c"
+#line 3352 "YouTubePublishing.c"
}
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return NULL;
-#line 3354 "YouTubePublishing.c"
+#line 3356 "YouTubePublishing.c"
}
@@ -3398,7 +3400,7 @@ static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privac
G_PARAM_SPEC (spec)->value_type = object_type;
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return G_PARAM_SPEC (spec);
-#line 3368 "YouTubePublishing.c"
+#line 3370 "YouTubePublishing.c"
}
@@ -3407,7 +3409,7 @@ static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_de
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return value->data[0].v_pointer;
-#line 3377 "YouTubePublishing.c"
+#line 3379 "YouTubePublishing.c"
}
@@ -3427,17 +3429,17 @@ static void publishing_you_tube_publishing_options_pane_value_set_privacy_descri
value->data[0].v_pointer = v_object;
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3397 "YouTubePublishing.c"
+#line 3399 "YouTubePublishing.c"
} else {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3401 "YouTubePublishing.c"
+#line 3403 "YouTubePublishing.c"
}
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3407 "YouTubePublishing.c"
+#line 3409 "YouTubePublishing.c"
}
}
@@ -3456,17 +3458,17 @@ static void publishing_you_tube_publishing_options_pane_value_take_privacy_descr
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = v_object;
-#line 3426 "YouTubePublishing.c"
+#line 3428 "YouTubePublishing.c"
} else {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
value->data[0].v_pointer = NULL;
-#line 3430 "YouTubePublishing.c"
+#line 3432 "YouTubePublishing.c"
}
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (old) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3436 "YouTubePublishing.c"
+#line 3438 "YouTubePublishing.c"
}
}
@@ -3476,14 +3478,14 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_clas
publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize;
-#line 3446 "YouTubePublishing.c"
+#line 3448 "YouTubePublishing.c"
}
static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) {
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->ref_count = 1;
-#line 3453 "YouTubePublishing.c"
+#line 3455 "YouTubePublishing.c"
}
@@ -3495,7 +3497,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_fina
g_signal_handlers_destroy (self);
#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (self->description);
-#line 3465 "YouTubePublishing.c"
+#line 3467 "YouTubePublishing.c"
}
@@ -3520,7 +3522,7 @@ static gpointer publishing_you_tube_publishing_options_pane_privacy_description_
g_atomic_int_inc (&self->ref_count);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return instance;
-#line 3490 "YouTubePublishing.c"
+#line 3492 "YouTubePublishing.c"
}
@@ -3533,7 +3535,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_unre
PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3503 "YouTubePublishing.c"
+#line 3505 "YouTubePublishing.c"
}
}
@@ -3549,7 +3551,7 @@ static void publishing_you_tube_publishing_options_pane_class_init (PublishingYo
g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3519 "YouTubePublishing.c"
+#line 3521 "YouTubePublishing.c"
}
@@ -3564,7 +3566,7 @@ static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_p
iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled;
-#line 3534 "YouTubePublishing.c"
+#line 3536 "YouTubePublishing.c"
}
@@ -3587,7 +3589,7 @@ static void publishing_you_tube_publishing_options_pane_instance_init (Publishin
self->priv->builder = NULL;
#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->privacy_label = NULL;
-#line 3557 "YouTubePublishing.c"
+#line 3559 "YouTubePublishing.c"
}
@@ -3617,7 +3619,7 @@ static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj)
_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj);
-#line 3587 "YouTubePublishing.c"
+#line 3589 "YouTubePublishing.c"
}
@@ -3638,7 +3640,7 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) {
static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3608 "YouTubePublishing.c"
+#line 3610 "YouTubePublishing.c"
}
@@ -3695,14 +3697,14 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const
self->priv->publishable = _tmp8_;
#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 3665 "YouTubePublishing.c"
+#line 3667 "YouTubePublishing.c"
}
PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3672 "YouTubePublishing.c"
+#line 3674 "YouTubePublishing.c"
}
@@ -3746,27 +3748,41 @@ 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 3716 "YouTubePublishing.c"
+#line 3718 "YouTubePublishing.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 3722 "YouTubePublishing.c"
+#line 3724 "YouTubePublishing.c"
+}
+
+
+static guint8* _vala_array_dup11 (guint8* self, int length) {
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ return g_memdup (self, length * sizeof (guint8));
+#line 3731 "YouTubePublishing.c"
}
static void _vala_SoupBuffer_free (SoupBuffer* self) {
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 3729 "YouTubePublishing.c"
+#line 3738 "YouTubePublishing.c"
}
static void _vala_SoupMultipart_free (SoupMultipart* self) {
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 3736 "YouTubePublishing.c"
+#line 3745 "YouTubePublishing.c"
+}
+
+
+static guint8* _vala_array_dup12 (guint8* self, int length) {
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ return g_memdup (self, length * sizeof (guint8));
+#line 3752 "YouTubePublishing.c"
}
@@ -3802,44 +3818,47 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
gint _tmp22__length1 = 0;
guint8* _tmp23_ = NULL;
gint _tmp23__length1 = 0;
- SoupBuffer* _tmp24_ = NULL;
- SoupMultipart* _tmp25_ = NULL;
- SoupBuffer* _tmp26_ = NULL;
+ guint8* _tmp24_ = NULL;
+ gint _tmp24__length1 = 0;
+ SoupBuffer* _tmp25_ = NULL;
+ SoupMultipart* _tmp26_ = NULL;
+ SoupBuffer* _tmp27_ = NULL;
gchar* video_data = NULL;
gsize data_length = 0UL;
SoupBuffer* bindable_data = NULL;
- const gchar* _tmp46_ = NULL;
- guint8* _tmp47_ = NULL;
- gint _tmp47__length1 = 0;
+ const gchar* _tmp47_ = NULL;
guint8* _tmp48_ = NULL;
gint _tmp48__length1 = 0;
- gsize _tmp49_ = 0UL;
- SoupBuffer* _tmp50_ = NULL;
- SoupMultipart* _tmp51_ = NULL;
- SpitPublishingPublishable* _tmp52_ = NULL;
- GFile* _tmp53_ = NULL;
+ guint8* _tmp49_ = NULL;
+ gint _tmp49__length1 = 0;
+ guint8* _tmp50_ = NULL;
+ gint _tmp50__length1 = 0;
+ SoupBuffer* _tmp51_ = NULL;
+ SoupMultipart* _tmp52_ = NULL;
+ SpitPublishingPublishable* _tmp53_ = NULL;
GFile* _tmp54_ = NULL;
- gchar* _tmp55_ = NULL;
+ GFile* _tmp55_ = NULL;
gchar* _tmp56_ = NULL;
- SoupMessage* outbound_message = NULL;
gchar* _tmp57_ = NULL;
+ SoupMessage* outbound_message = NULL;
gchar* _tmp58_ = NULL;
- SoupMultipart* _tmp59_ = NULL;
- SoupMessage* _tmp60_ = NULL;
+ gchar* _tmp59_ = NULL;
+ SoupMultipart* _tmp60_ = NULL;
SoupMessage* _tmp61_ = NULL;
- SoupMessageHeaders* _tmp62_ = NULL;
- gchar* _tmp63_ = NULL;
+ SoupMessage* _tmp62_ = NULL;
+ SoupMessageHeaders* _tmp63_ = NULL;
gchar* _tmp64_ = NULL;
- SoupMessageHeaders* _tmp65_ = NULL;
- SpitPublishingPublishable* _tmp66_ = NULL;
- gchar* _tmp67_ = NULL;
+ gchar* _tmp65_ = NULL;
+ SoupMessageHeaders* _tmp66_ = NULL;
+ SpitPublishingPublishable* _tmp67_ = NULL;
gchar* _tmp68_ = NULL;
- SoupMessageHeaders* _tmp69_ = NULL;
- PublishingRESTSupportGoogleSession* _tmp70_ = NULL;
- gchar* _tmp71_ = NULL;
+ gchar* _tmp69_ = NULL;
+ SoupMessageHeaders* _tmp70_ = NULL;
+ PublishingRESTSupportGoogleSession* _tmp71_ = NULL;
gchar* _tmp72_ = NULL;
gchar* _tmp73_ = NULL;
gchar* _tmp74_ = NULL;
+ gchar* _tmp75_ = NULL;
GError * _inner_error_ = NULL;
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
@@ -3855,11 +3874,11 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
if (_tmp3_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp1_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_UNLISTED_XML;
-#line 3825 "YouTubePublishing.c"
+#line 3844 "YouTubePublishing.c"
} else {
#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp1_ = "";
-#line 3829 "YouTubePublishing.c"
+#line 3848 "YouTubePublishing.c"
}
#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp4_ = g_strdup (_tmp1_);
@@ -3873,11 +3892,11 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
if (_tmp7_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE) {
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp5_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_PRIVATE_XML;
-#line 3843 "YouTubePublishing.c"
+#line 3862 "YouTubePublishing.c"
} else {
#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp5_ = "";
-#line 3847 "YouTubePublishing.c"
+#line 3866 "YouTubePublishing.c"
}
#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp8_ = g_strdup (_tmp5_);
@@ -3893,7 +3912,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
_tmp11_ = title;
#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (g_strcmp0 (_tmp11_, "") == 0) {
-#line 3863 "YouTubePublishing.c"
+#line 3882 "YouTubePublishing.c"
SpitPublishingPublishable* _tmp12_ = NULL;
gchar* _tmp13_ = NULL;
#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3904,7 +3923,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
_g_free0 (title);
#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
title = _tmp13_;
-#line 3874 "YouTubePublishing.c"
+#line 3893 "YouTubePublishing.c"
}
#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp14_ = title;
@@ -3933,51 +3952,55 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp23__length1 = _tmp22__length1;
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_, _tmp23__length1);
+ _tmp24_ = (_tmp23_ != NULL) ? _vala_array_dup11 (_tmp23_, _tmp23__length1) : ((gpointer) _tmp23_);
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp24__length1 = _tmp23__length1;
#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- metadata_buffer = _tmp24_;
+ _tmp25_ = soup_buffer_new_take (_tmp24_, _tmp24__length1);
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ metadata_buffer = _tmp25_;
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp25_ = message_parts;
+ _tmp26_ = message_parts;
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp26_ = metadata_buffer;
+ _tmp27_ = metadata_buffer;
#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- soup_multipart_append_form_file (_tmp25_, "", "", "application/atom+xml", _tmp26_);
-#line 3912 "YouTubePublishing.c"
+ soup_multipart_append_form_file (_tmp26_, "", "", "application/atom+xml", _tmp27_);
+#line 3935 "YouTubePublishing.c"
{
- SpitPublishingPublishable* _tmp27_ = NULL;
- GFile* _tmp28_ = NULL;
+ SpitPublishingPublishable* _tmp28_ = NULL;
GFile* _tmp29_ = NULL;
- gchar* _tmp30_ = NULL;
+ GFile* _tmp30_ = NULL;
gchar* _tmp31_ = NULL;
gchar* _tmp32_ = NULL;
- gsize _tmp33_ = 0UL;
+ gchar* _tmp33_ = NULL;
+ gsize _tmp34_ = 0UL;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp27_ = self->priv->publishable;
+ _tmp28_ = self->priv->publishable;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
+ _tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp29_ = _tmp28_;
+ _tmp30_ = _tmp29_;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp30_ = g_file_get_path (_tmp29_);
+ _tmp31_ = g_file_get_path (_tmp30_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp31_ = _tmp30_;
+ _tmp32_ = _tmp31_;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_file_get_contents (_tmp31_, &_tmp32_, &_tmp33_, &_inner_error_);
+ g_file_get_contents (_tmp32_, &_tmp33_, &_tmp34_, &_inner_error_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (video_data);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- video_data = _tmp32_;
+ video_data = _tmp33_;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- data_length = _tmp33_;
+ data_length = _tmp34_;
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp31_);
+ _g_free0 (_tmp32_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_object_unref0 (_tmp29_);
+ _g_object_unref0 (_tmp30_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 3947 "YouTubePublishing.c"
+#line 3970 "YouTubePublishing.c"
goto __catch31_g_file_error;
}
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -4000,7 +4023,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
g_clear_error (&_inner_error_);
#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 3970 "YouTubePublishing.c"
+#line 3993 "YouTubePublishing.c"
}
}
goto __finally31;
@@ -4008,61 +4031,61 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
{
GError* e = NULL;
gchar* msg = NULL;
- SpitPublishingPublishable* _tmp34_ = NULL;
- GFile* _tmp35_ = NULL;
+ SpitPublishingPublishable* _tmp35_ = NULL;
GFile* _tmp36_ = NULL;
- gchar* _tmp37_ = NULL;
+ GFile* _tmp37_ = NULL;
gchar* _tmp38_ = NULL;
- GError* _tmp39_ = NULL;
- const gchar* _tmp40_ = NULL;
- gchar* _tmp41_ = NULL;
+ gchar* _tmp39_ = NULL;
+ GError* _tmp40_ = NULL;
+ const gchar* _tmp41_ = NULL;
gchar* _tmp42_ = NULL;
- const gchar* _tmp43_ = NULL;
+ gchar* _tmp43_ = NULL;
const gchar* _tmp44_ = NULL;
- GError* _tmp45_ = NULL;
+ const gchar* _tmp45_ = NULL;
+ GError* _tmp46_ = NULL;
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
e = _inner_error_;
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_inner_error_ = NULL;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp34_ = self->priv->publishable;
+ _tmp35_ = self->priv->publishable;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp35_ = spit_publishing_publishable_get_serialized_file (_tmp34_);
+ _tmp36_ = spit_publishing_publishable_get_serialized_file (_tmp35_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp36_ = _tmp35_;
+ _tmp37_ = _tmp36_;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp37_ = g_file_get_path (_tmp36_);
+ _tmp38_ = g_file_get_path (_tmp37_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp38_ = _tmp37_;
+ _tmp39_ = _tmp38_;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp39_ = e;
+ _tmp40_ = e;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp40_ = _tmp39_->message;
+ _tmp41_ = _tmp40_->message;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp41_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp38_, _tmp40_);
+ _tmp42_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp39_, _tmp41_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp42_ = _tmp41_;
+ _tmp43_ = _tmp42_;
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp38_);
+ _g_free0 (_tmp39_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_object_unref0 (_tmp36_);
+ _g_object_unref0 (_tmp37_);
#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- msg = _tmp42_;
+ msg = _tmp43_;
#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp43_ = msg;
+ _tmp44_ = msg;
#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- g_warning ("YouTubePublishing.vala:580: %s", _tmp43_);
+ g_warning ("YouTubePublishing.vala:580: %s", _tmp44_);
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp44_ = msg;
+ _tmp45_ = msg;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp45_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp44_);
+ _tmp46_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp45_);
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _inner_error_ = _tmp45_;
+ _inner_error_ = _tmp46_;
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (msg);
#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_error_free0 (e);
-#line 4032 "YouTubePublishing.c"
+#line 4055 "YouTubePublishing.c"
goto __finally31;
}
__finally31:
@@ -4088,7 +4111,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
__vala_SoupMultipart_free0 (message_parts);
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 4058 "YouTubePublishing.c"
+#line 4081 "YouTubePublishing.c"
} else {
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (video_data);
@@ -4110,154 +4133,156 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
g_clear_error (&_inner_error_);
#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 4080 "YouTubePublishing.c"
+#line 4103 "YouTubePublishing.c"
}
}
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp46_ = video_data;
+ _tmp47_ = video_data;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp47_ = string_get_data (_tmp46_, &_tmp47__length1);
+ _tmp48_ = string_get_data (_tmp47_, &_tmp48__length1);
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp48_ = _tmp47_;
+ _tmp49_ = _tmp48_;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp48__length1 = _tmp47__length1;
+ _tmp49__length1 = _tmp48__length1;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp49_ = data_length;
+ _tmp50_ = (_tmp49_ != NULL) ? _vala_array_dup12 (_tmp49_, _tmp49__length1) : ((gpointer) _tmp49_);
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp50_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp48_ + 0, ((gint) _tmp49_) - 0);
+ _tmp50__length1 = _tmp49__length1;
#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- bindable_data = _tmp50_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp51_ = message_parts;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp52_ = self->priv->publishable;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp53_ = spit_publishing_publishable_get_serialized_file (_tmp52_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp54_ = _tmp53_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp55_ = g_file_get_path (_tmp54_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp56_ = _tmp55_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- soup_multipart_append_form_file (_tmp51_, "", _tmp56_, "video/mpeg", bindable_data);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp56_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_object_unref0 (_tmp54_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp57_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp58_ = _tmp57_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp59_ = message_parts;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp60_ = soup_form_request_new_from_multipart (_tmp58_, _tmp59_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp61_ = _tmp60_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp58_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- outbound_message = _tmp61_;
+ _tmp51_ = soup_buffer_new_take (_tmp50_, _tmp50__length1);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ bindable_data = _tmp51_;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp52_ = message_parts;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp53_ = self->priv->publishable;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp54_ = spit_publishing_publishable_get_serialized_file (_tmp53_);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp55_ = _tmp54_;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp56_ = g_file_get_path (_tmp55_);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp57_ = _tmp56_;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ soup_multipart_append_form_file (_tmp52_, "", _tmp57_, "video/mpeg", bindable_data);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _g_free0 (_tmp57_);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _g_object_unref0 (_tmp55_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp59_ = _tmp58_;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp60_ = message_parts;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp61_ = soup_form_request_new_from_multipart (_tmp59_, _tmp60_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp62_ = _tmp61_;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _g_free0 (_tmp59_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ outbound_message = _tmp62_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp63_ = outbound_message->request_headers;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp64_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp65_ = _tmp64_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ soup_message_headers_append (_tmp63_, "X-GData-Key", _tmp65_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _g_free0 (_tmp65_);
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp66_ = outbound_message->request_headers;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp62_ = outbound_message->request_headers;
+ _tmp67_ = self->priv->publishable;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp63_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY);
+ _tmp68_ = spit_publishing_publishable_get_param_string (_tmp67_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp64_ = _tmp63_;
+ _tmp69_ = _tmp68_;
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- soup_message_headers_append (_tmp62_, "X-GData-Key", _tmp64_);
+ soup_message_headers_append (_tmp66_, "Slug", _tmp69_);
#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp64_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp65_ = outbound_message->request_headers;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp66_ = self->priv->publishable;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp67_ = spit_publishing_publishable_get_param_string (_tmp66_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp68_ = _tmp67_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- soup_message_headers_append (_tmp65_, "Slug", _tmp68_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp68_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp69_ = outbound_message->request_headers;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp70_ = self->priv->session;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp71_ = publishing_rest_support_google_session_get_access_token (_tmp70_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp72_ = _tmp71_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp73_ = g_strconcat ("Bearer ", _tmp72_, NULL);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _tmp74_ = _tmp73_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- soup_message_headers_append (_tmp69_, "Authorization", _tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _g_free0 (_tmp72_);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _g_free0 (_tmp69_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp70_ = outbound_message->request_headers;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp71_ = self->priv->session;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp72_ = publishing_rest_support_google_session_get_access_token (_tmp71_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp73_ = _tmp72_;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp74_ = g_strconcat ("Bearer ", _tmp73_, NULL);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _tmp75_ = _tmp74_;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ soup_message_headers_append (_tmp70_, "Authorization", _tmp75_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _g_free0 (_tmp75_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _g_free0 (_tmp73_);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_propagate_error (error, _inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 4201 "YouTubePublishing.c"
+#line 4226 "YouTubePublishing.c"
} else {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.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 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_clear_error (&_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return;
-#line 4227 "YouTubePublishing.c"
+#line 4252 "YouTubePublishing.c"
}
}
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -4278,7 +4303,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
_g_free0 (unlisted_video);
#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 4248 "YouTubePublishing.c"
+#line 4273 "YouTubePublishing.c"
}
@@ -4291,14 +4316,14 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube
g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate));
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_you_tube_upload_transaction_real_execute;
-#line 4261 "YouTubePublishing.c"
+#line 4286 "YouTubePublishing.c"
}
static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) {
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4268 "YouTubePublishing.c"
+#line 4293 "YouTubePublishing.c"
}
@@ -4314,7 +4339,7 @@ static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSuppo
_g_object_unref0 (self->priv->publishable);
#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj);
-#line 4284 "YouTubePublishing.c"
+#line 4309 "YouTubePublishing.c"
}
@@ -4337,36 +4362,36 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_
gint _tmp1__length1 = 0;
PublishingYouTubePublishingParameters* _tmp2_ = NULL;
PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp0_ = session;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp1_ = publishables;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp1__length1 = publishables_length1;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp2_ = parameters;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv->parameters = _tmp3_;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return self;
-#line 4329 "YouTubePublishing.c"
+#line 4354 "YouTubePublishing.c"
}
PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 4336 "YouTubePublishing.c"
+#line 4361 "YouTubePublishing.c"
}
@@ -4380,65 +4405,65 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat
SpitPublishingPublishable* _tmp4_ = NULL;
PublishingYouTubeUploadTransaction* _tmp5_ = NULL;
PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp2_ = self->priv->parameters;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp4_ = _tmp3_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp5_ = publishing_you_tube_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_g_object_unref0 (_tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
result = _tmp6_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
return result;
-#line 4376 "YouTubePublishing.c"
+#line 4401 "YouTubePublishing.c"
}
static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_you_tube_uploader_finalize;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_you_tube_uploader_real_create_transaction;
-#line 4389 "YouTubePublishing.c"
+#line 4414 "YouTubePublishing.c"
}
static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 4396 "YouTubePublishing.c"
+#line 4421 "YouTubePublishing.c"
}
static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
PublishingYouTubeUploader * self;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
- _publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+ _publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj);
-#line 4408 "YouTubePublishing.c"
+#line 4433 "YouTubePublishing.c"
}
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index 48241bd..d7db9f8 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -565,7 +565,7 @@ internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.Authen
string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(title),
private_video, unlisted_video);
- Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data);
+ var metadata_buffer = new Soup.Buffer.take (metadata.data);
message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer);
// attempt to read the binary video data from disk
@@ -585,8 +585,7 @@ internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.Authen
// bind the binary video data read from disk into a Soup.Buffer object so that we
// can attach it to the multipart request, then actaully append the buffer
// to the multipart request. Then, set the MIME type for this part.
- Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY,
- video_data.data[0:data_length]);
+ var bindable_data = new Soup.Buffer.take (video_data.data);
message_parts.append_form_file("", publishable.get_serialized_file().get_path(),
"video/mpeg", bindable_data);
diff --git a/plugins/shotwell-publishing/piwigo_authentication_pane.ui b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
index ec24aed..39c8d7c 100644
--- a/plugins/shotwell-publishing/piwigo_authentication_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
@@ -1,173 +1,174 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkWindow" id="authentication_pane">
<property name="can_focus">False</property>
<child>
- <object class="GtkAlignment" id="alignment">
+ <object class="GtkBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xscale">0.5</property>
- <property name="yscale">0.5</property>
+ <property name="margin_left">30</property>
+ <property name="margin_right">30</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkLabel" id="message_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">30</property>
- <property name="margin_right">30</property>
+ <property name="halign">start</property>
<property name="hexpand">True</property>
- <property name="spacing">8</property>
+ <property name="vexpand">True</property>
+ <property name="label">label</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="field_table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="message_label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_URL of your Piwigo photo library</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">url_entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="url_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="no">label</property>
- <property name="wrap">True</property>
+ <property name="invisible_char">●</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSwitch" id="remember_password_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="field_table">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_URL of your Piwigo photo library</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">url_entry</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">User _name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">username_entry</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="url_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="username_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="password_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">User _name</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="remember_password_checkbutton">
- <property name="label" translatable="yes">_Remember Password</property>
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="mnemonic_widget">password_entry</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkButton" id="login_button">
- <property name="label" translatable="yes">Log in</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Remember Password</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="login_button">
+ <property name="label" translatable="yes">Log in</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
diff --git a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
index 7197603..bbcd942 100644
--- a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
@@ -1,312 +1,287 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="publishing_options_pane">
<property name="can_focus">False</property>
<child>
- <object class="GtkAlignment" id="alignment">
+ <object class="GtkBox" id="content">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xscale">0.5</property>
- <property name="yscale">0.5</property>
+ <property name="margin_left">10</property>
+ <property name="margin_right">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="vbox1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="margin_right">10</property>
- <property name="orientation">vertical</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Photos will appear in:</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="field_table">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="use_existing_radio">
+ <property name="label" translatable="yes">An _existing category</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkLabel" id="label1">
+ <object class="GtkComboBoxText" id="existing_categories_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Photos will appear in:</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="field_table">
+ <object class="GtkComboBoxText" id="within_existing_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">7</property>
- <property name="n_columns">2</property>
- <child>
- <object class="GtkRadioButton" id="use_existing_radio">
- <property name="label" translatable="yes">An _existing category:</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">1</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- <child>
- <object class="GtkRadioButton" id="create_new_radio">
- <property name="label" translatable="yes">A _new album named:</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">1</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">use_existing_radio</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="existing_categories_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="new_category_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="within_existing_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator" id="hseparator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">Photos will be _visible by:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">perms_combo</property>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="perms_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">Photo size:</property>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="size_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="within_existing_label">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">within category:</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="perms_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="size_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="album_comment_scroll">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow" id="album_comment_scroll">
+ <object class="GtkTextView" id="album_comment">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTextView" id="album_comment">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="wrap_mode">word</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="album_comment_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">Album comment:</property>
+ <property name="wrap_mode">word</property>
</object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="strip_metadata_check">
- <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
+ <object class="GtkRadioButton" id="create_new_radio">
+ <property name="label" translatable="yes">A _new album named</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">end</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">use_existing_radio</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="title_as_comment_check">
- <property name="label" translatable="yes">_If a title is set and comment unset, use title as comment</property>
+ <object class="GtkEntry" id="new_category_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="invisible_char">●</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="within_existing_label">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">within category</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="album_comment_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="valign">start</property>
+ <property name="label" translatable="yes">Album comment</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Photos will be _visible by</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="mnemonic_widget">perms_combo</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Photo size</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="no_upload_tags_check">
- <property name="label" translatable="yes">_Do no upload tags</property>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="strip_metadata_check">
+ <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="title_as_comment_check">
+ <property name="label" translatable="yes">_If a title is set and comment unset, use title as comment</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="no_upload_tags_check">
+ <property name="label" translatable="yes">_Do no upload tags</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="logout_button">
+ <property name="label" translatable="yes">Logout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="receives_default">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButtonBox" id="hbuttonbox1">
+ <object class="GtkButton" id="publish_button">
+ <property name="label" translatable="yes">Publish</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkButton" id="logout_button">
- <property name="label" translatable="yes">Logout</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="publish_button">
- <property name="label" translatable="yes">Publish</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
</child>
</object>
</child>